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

added Waseem to about page

Browse source
This commit is contained in:
Kiritan Flux 2019-01-11 12:29:56 +01:00
parent ac9082a83b
commit 2da4a637b0
96 changed files with 228 additions and 968 deletions
Download patch file Download diff file Expand all files Collapse all files

12
_site/video/index.html
View file

@ -123,19 +123,11 @@
<<<<<<< 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
@ -143,11 +135,11 @@
<a class="topic" data-scroll-nav="10">CYborg</a>
<a class="topic" data-scroll-nav="10">cyborg, feminism, performance, installation</a>
<a class="topic" data-scroll-nav="10">Electronic music</a>
<a class="topic" data-scroll-nav="10">music, dance</a>