<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/docker/marathon.json, branch bump_gitlab_shell</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce</title>
<updated>2015-07-10T16:44:54+00:00</updated>
<author>
<name>Sytse Sijbrandij</name>
<email>sytse@gitlab.com</email>
</author>
<published>2015-07-10T16:44:54+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=526813581b042bc6abad60eb4e582be81620be77'/>
<id>526813581b042bc6abad60eb4e582be81620be77</id>
<content type='text'>
Conflicts:
	docker/marathon.json
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	docker/marathon.json
</pre>
</div>
</content>
</entry>
<entry>
<title>Add volumes to marathon file.</title>
<updated>2015-07-10T16:43:32+00:00</updated>
<author>
<name>Sytse Sijbrandij</name>
<email>sytse@gitlab.com</email>
</author>
<published>2015-07-10T16:43:32+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1ea0db475f399c3d1a841bbcfe8e19518e88506f'/>
<id>1ea0db475f399c3d1a841bbcfe8e19518e88506f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update image to latest one</title>
<updated>2015-07-10T16:32:09+00:00</updated>
<author>
<name>Sytse Sijbrandij</name>
<email>sytse@gitlab.com</email>
</author>
<published>2015-07-10T16:32:09+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=aa33189c09c5f096db5cb59bfa23741cb148f46e'/>
<id>aa33189c09c5f096db5cb59bfa23741cb148f46e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update Docker documentation to use single container</title>
<updated>2015-07-06T14:42:52+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2015-06-29T15:56:34+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=954c1df256ac867635b31e82a032704e963a10ee'/>
<id>954c1df256ac867635b31e82a032704e963a10ee</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
