Commit graph

4 commits

Author SHA1 Message Date
Kiritan Flux
83558f7bce - update 2018-12-05 13:22:41 +01:00
Kiritan Flux
05cf48534a Merge branch 'master' of https://bitbucket.org/acorbi/scopesessions.org
# Conflicts:
#	_posts/session/2018-11-08-077.markdown
#	_site/about/index.html
#	_site/artists/index.html
#	_site/feed.json
#	_site/feed.xml
#	_site/index.html
#	_site/newsletter_content/index.html
#	_site/session/2018/11/08/077.html
#	_site/video/index.html
#	_site/video_fullscreen/index.html
2018-12-05 13:12:01 +01:00
Kiritan Flux
13ff436bb4 added November session, edited October Session 2018-11-07 20:59:18 +01:00
Alex Corbi
ebf509d5dd #77 2018-10-31 23:40:22 +01:00