Merge branch 'master' of https://git.xpub.nl/XPUB/project.xpub.nl

index.html

@@ -233,14 +233,14 @@
  <div class='col5'><h2><span class='long'>Publications</span><span class='short'>Pub.</span></h2></div>
  </div>
  <div id='content'>
- <!-- ATTENTION 2020 STUDENTS !!! THIS IS YOUR AREA. UNCOMMENT IT WHEN YOU ARE READY TO PUBLISH.
 
  <div id='year2020' class='row'>
  <div class='col1'><img src='img/xpub_logo_2020.svg' class='logo'/><p class='gradShow'>c_o_l_l_e_c_t_i_v_e_i_o_n_i_n_g</p><p>July 2020</p></div>
+ <!--
  <div class='attch'>
    <p><a href="linkto/attachment1" target='_blank' class="ext">📎 Attachment 1</a></p>
    <p><a href="linkto/attachment2" class="int">📎 Attachment 2</a></p>
-   </div>
+   </div>-->
  <div class='col6'>
  <div class='subrow'>
  <p class='subcl1'>Simon Browne</p>
@@ -251,17 +251,17 @@
  <div class='subrow'>
  <p class='subcl1'>Tancredi Di Giovanni</p>
  <p class='subcl2'><a href='ilinx/' target="_blank" class='ext'>ilinx</p>
- <p class='subcl3'><a href='ilinx/pdf/OHE.pdf' target="_blank" class='ext'>Out of Hardware Experience: Consciousness and Software</a> // <a href='#2020-att2' class='int'>IMG</a></p>
+ <p class='subcl3'><a href='ilinx/pdf/OHE.pdf' target="_blank" class='ext'>Out of Hardware Experience: Consciousness and Software</a> <!--// <a href='#2020-att2' class='int'>IMG</a>--></p>
  </div>
  <div class='subrow'>
  <p class='subcl1'>Bohye Woo</p>
  <p class='subcl2'><a href='parallel-colonialism/' target="_blank" class='ext'>Parallel Colonialism</a></p>
- <p class='subcl3'><a href='parallel-colonialism/pdf/bohye-woo-thesis-2020.pdf' target="_blank" class='ext'>PDF</a> // <a href='#2020-att3' class='int'>IMG</a></p>
+ <p class='subcl3'><a href='parallel-colonialism/pdf/bohye-woo-thesis-2020.pdf' target="_blank" class='ext'>PDF</a><!-- // <a href='#2020-att3' class='int'>IMG</a>--></p>
  </div>
  <div class='subrow'>
  <p class='subcl1'>Paloma Garcia</p>
- <p class='subcl2'><a href='empty.html' target="_blank" class='ext'>Project Name</a></p>
+ <p class='subcl2'><a href='cartographies-of-counter-speculation/' target="_blank" class='ext'>Cartographies of Counter Speculation</a></p>
- <p class='subcl3'><a href='test.pdf' target="_blank" class='ext'>PDF</a> // <a href='#2020-att4' class='int'>IMG</a></p>
+ <p class='subcl3'><a href='cartographies-of-counter-speculation/pdf/garcia-paloma-cartographies-of-invisibility.pdf' target="_blank" class='ext'>PDF</a> <!-- // <a href='#2020-att4' class='int'>IMG</a>--></p>
  </div>
  <div class='subrow'>
  <p class='subcl1'>Artemis Gryllaki</p>
@@ -281,12 +281,11 @@
  <div class='subrow'>
  <p class='subcl1'>Biyi Wen</p>
  <p class='subcl2'><a href='the-repeater-archive/' target="_blank" class='ext'>The Repeater Archive</a></p>
- <p class='subcl3'><a href='the-repeater-archive/pdf/Biyi_Wen_Thesis.pdf' target="_blank" class='ext'>PDF</a> // <a href='#2020-att8' class='int'>IMG</a></p>
+ <p class='subcl3'><a href='the-repeater-archive/pdf/Biyi_Wen_Thesis.pdf' target="_blank" class='ext'>PDF</a> <!--// <a href='#2020-att8' class='int'>IMG</a>--></p>
  </div>
 </div>
 </div>
 
--->
  <div id='year2019' class='row'>
  <div class='col1'><img src='img/xpub_logo_2019.png' class='logo'/><p class='gradShow'>UPSETTING SETTINGS</p><p>July 2019</p>
    <div class='attch'>