Merge branch 'master' of https://bitbucket.org/acorbi/scopesessions.org
This commit is contained in:
commit
ac9082a83b
178 changed files with 1500 additions and 3483 deletions
|
|
@ -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
|
||||
|
||||
|
||||
|
||||
|
|
@ -1634,6 +1642,23 @@
|
|||
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="gallery dark_bg col-md-7 col-md-offset-3">
|
||||
|
||||
<h4>Photo gallery of the event</h4>
|
||||
<div class="picbook"></div>
|
||||
<script type="text/javascript">
|
||||
var picbook = new picbookJs({
|
||||
limit: 100,
|
||||
albumId: '1920501021370206'
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue