randogoth/scopesessions.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://bitbucket.org/acorbi/scopesessions.org

Browse source
This commit is contained in:
Alex Corbi 2019-01-06 13:19:33 +01:00
commit ac9082a83b
178 changed files with 1500 additions and 3483 deletions
Download patch file Download diff file Expand all files Collapse all files

8
_site/event-special/2012/06/01/LPM.html
View file

@ -122,11 +122,19 @@
<<<<<<< HEAD
<a class="topic" data-scroll-nav="9">nature</a>
<a class="topic" data-scroll-nav="9">audiovisual</a>
=======
<a class="topic" data-scroll-nav="9">cyborg, feminism, performance, installation</a>
<a class="topic" data-scroll-nav="9">music, dance</a>
>>>>>>> b8754bd4bc6ed62dd094538c2060344bb8086f66