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 
# 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
commit 05cf48534a
179 changed files with 38719 additions and 32839 deletions
Download patch file Download diff file Expand all files Collapse all files

35
_site/feed.xml
View file

@ -4,11 +4,43 @@
<title>Scope Sessions Artist talks &amp; media salon</title>
<description>Scope is a meeting point for the creative and the curious, a platform for sharing and learning in an informal setting. Guest artists are invited to present a project, a concept, a process or an experience. The presentations are short, around 40 minutes and unrestricted in form. Each session offers a variety of topics and approaches; Scope is about exposure, not for the artist, but for the audience. If you wish to share at one of our sessions send us a mail to mail [at] scopesessions [dot] org. Our focus is on intermedia arts and technologies, but we love to be surprised..!
</description>
<<<<<<< HEAD
<link>http://localhost:4000/</link>
<atom:link href="http://localhost:4000 /feed.xml " rel="self" type="application/rss+xml" />
<pubDate>Wed, 07 Nov 2018 20:56:34 +0100</pubDate>
<lastBuildDate>Wed, 07 Nov 2018 20:56:34 +0100</lastBuildDate>
<generator>Jekyll v3.3.1</generator>
=======
<link>http://scopesessions.org/</link>
<atom:link href="http://scopesessions.org /feed.xml " rel="self" type="application/rss+xml" />
<pubDate>Mon, 03 Dec 2018 22:29:42 +0100</pubDate>
<lastBuildDate>Mon, 03 Dec 2018 22:29:42 +0100</lastBuildDate>
<generator>Jekyll v3.1.6</generator>
<item>
<title>078</title>
<description>
</description>
<pubDate>Thu, 13 Dec 2018 00:00:00 +0100</pubDate>
<link>http://scopesessions.org/session/2018/12/13/078.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2018/12/13/078.html</guid>
<category>session</category>
</item>
<item>
<title>077</title>
<description>
</description>
<pubDate>Thu, 08 Nov 2018 00:00:00 +0100</pubDate>
<link>http://scopesessions.org/session/2018/11/08/077.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2018/11/08/077.html</guid>
<category>session</category>
</item>
>>>>>>> 1f73d0f078cc399e14b6596f6e4862c4f84a2d0c
<item>
<title>077</title>
@ -118,6 +150,7 @@
</item>
<<<<<<< HEAD
<item>
<title>069</title>
<description>
@ -130,5 +163,7 @@
</item>
=======
>>>>>>> 1f73d0f078cc399e14b6596f6e4862c4f84a2d0c
</channel>
</rss>