<feed xmlns='http://www.w3.org/2005/Atom'>
<title>gifmusicvideo/views, branch master</title>
<subtitle>Make music videos from gifs</subtitle>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/'/>
<entry>
<title>link in top</title>
<updated>2012-11-11T19:30:37+00:00</updated>
<author>
<name>Grant Custer</name>
</author>
<published>2012-11-11T19:30:37+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=b278e51d236eefa2551b87c64b5edbc52ee4acd2'/>
<id>b278e51d236eefa2551b87c64b5edbc52ee4acd2</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>gif cap</title>
<updated>2012-11-11T19:11:58+00:00</updated>
<author>
<name>Grant Custer</name>
</author>
<published>2012-11-11T19:11:58+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=89be3bac52e77fe91c97acd88f7b8fe99c404e24'/>
<id>89be3bac52e77fe91c97acd88f7b8fe99c404e24</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>programmatic play</title>
<updated>2012-11-11T19:02:41+00:00</updated>
<author>
<name>Grant Custer</name>
</author>
<published>2012-11-11T19:02:41+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=029bd99839052d3420a4703e51207941c9a797bf'/>
<id>029bd99839052d3420a4703e51207941c9a797bf</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>toggle works</title>
<updated>2012-11-11T18:32:41+00:00</updated>
<author>
<name>Grant Custer</name>
</author>
<published>2012-11-11T18:32:41+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=6128d7b0501707e37d9d477908e3655b9ef34d11'/>
<id>6128d7b0501707e37d9d477908e3655b9ef34d11</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' of github.com:anrope/gifmusicvideo</title>
<updated>2012-11-11T17:46:12+00:00</updated>
<author>
<name>Grant Custer</name>
</author>
<published>2012-11-11T17:46:12+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=b974c00d49f31df5ae64437ff6afaaeb09a25322'/>
<id>b974c00d49f31df5ae64437ff6afaaeb09a25322</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>tray styling changes</title>
<updated>2012-11-11T17:46:03+00:00</updated>
<author>
<name>Grant Custer</name>
</author>
<published>2012-11-11T17:46:03+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=d020b18a752dff5f920059311bb1b75be07fe943'/>
<id>d020b18a752dff5f920059311bb1b75be07fe943</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' of https://github.com/anrope/gifmusicvideo</title>
<updated>2012-11-11T17:19:36+00:00</updated>
<author>
<name>Albert Nazander</name>
</author>
<published>2012-11-11T17:19:36+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=b426bf0baa2389208ce5914b415aea79015a2a1c'/>
<id>b426bf0baa2389208ce5914b415aea79015a2a1c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' of https://github.com/anrope/gifmusicvideo</title>
<updated>2012-11-11T17:19:28+00:00</updated>
<author>
<name>Albert Nazander</name>
</author>
<published>2012-11-11T17:19:28+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=47bda52e9e9acc93a84abdc1b4cb1dc6c38d698e'/>
<id>47bda52e9e9acc93a84abdc1b4cb1dc6c38d698e</id>
<content type='text'>
Conflicts:
	public/js/controllers.js
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	public/js/controllers.js
</pre>
</div>
</content>
</entry>
<entry>
<title>Resolved merge conflict</title>
<updated>2012-11-11T17:16:37+00:00</updated>
<author>
<name>Andy Pellett</name>
</author>
<published>2012-11-11T17:16:37+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=b1452c042a7454538a1d86513652bc24d5c392ff'/>
<id>b1452c042a7454538a1d86513652bc24d5c392ff</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Working on loading new suggest gifs</title>
<updated>2012-11-11T17:13:22+00:00</updated>
<author>
<name>Andy Pellett</name>
</author>
<published>2012-11-11T17:13:22+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/gifmusicvideo/commit/?id=8f3908697eab9aa03c2488724f91ab204ccb116e'/>
<id>8f3908697eab9aa03c2488724f91ab204ccb116e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
