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

Browse source

# 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

...

This commit is contained in:

Kiritan Flux 2018-12-05 13:12:01 +01:00

parent dc8e0317b6 1f73d0f078

commit 05cf48534a

179 changed files with 38719 additions and 32839 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

954

_site/about/index.html

View file

File diff suppressed because it is too large Load diff