<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Ishtar/install, branch debian/wheezy</title>
<subtitle>Logiciel de gestion et d'inventaire en archéologie</subtitle>
<id>http://git.iggdrasil.net/Ishtar/atom?h=debian%2Fwheezy</id>
<link rel='self' href='http://git.iggdrasil.net/Ishtar/atom?h=debian%2Fwheezy'/>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/'/>
<updated>2017-01-24T10:06:02+00:00</updated>
<entry>
<title>Merge branch 'v0.9' into wheezy</title>
<updated>2017-01-24T10:06:02+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2017-01-24T10:06:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=282186421b25ec64ce4c0559a418bc4bc4ad3ce0'/>
<id>urn:sha1:282186421b25ec64ce4c0559a418bc4bc4ad3ce0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into v0.9</title>
<updated>2017-01-24T10:00:36+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2017-01-24T10:00:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=2a8d0c0edb7281e955fd7ad097e205f07cca1d5c'/>
<id>urn:sha1:2a8d0c0edb7281e955fd7ad097e205f07cca1d5c</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update gitlab links</title>
<updated>2017-01-23T12:01:07+00:00</updated>
<author>
<name>Valérie-Emma Leroux</name>
<email>emma@iggdrasil.net</email>
</author>
<published>2017-01-23T12:01:07+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=f02eaa8d0ab5a381b64b7108dc9f4a7c3ffdbcef'/>
<id>urn:sha1:f02eaa8d0ab5a381b64b7108dc9f4a7c3ffdbcef</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'v0.9' into wheezy</title>
<updated>2016-09-02T08:44:05+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-09-02T08:44:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=c96cba070566ab4703504591a413b9c1e5106f3a'/>
<id>urn:sha1:c96cba070566ab4703504591a413b9c1e5106f3a</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into v0.9</title>
<updated>2016-09-02T08:10:59+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-09-02T08:10:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=151e42654a4bcfcff408c7799db199c71e81b5c5'/>
<id>urn:sha1:151e42654a4bcfcff408c7799db199c71e81b5c5</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Install: default nginx conf wait after long uwsgi response (refs #3174)</title>
<updated>2016-08-30T15:12:28+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-08-30T15:11:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=998fc1779b089e7fc29e2958eb8f3ffc7b02344b'/>
<id>urn:sha1:998fc1779b089e7fc29e2958eb8f3ffc7b02344b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'v0.9' into wheezy</title>
<updated>2016-07-16T18:22:28+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-07-16T18:22:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=6dde6c2bb035644f93df7c039531e688a680556d'/>
<id>urn:sha1:6dde6c2bb035644f93df7c039531e688a680556d</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into v0.9</title>
<updated>2016-07-16T18:10:57+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-07-16T18:10:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=d4119bdffd893943263a82813f6b783fda0253dd'/>
<id>urn:sha1:d4119bdffd893943263a82813f6b783fda0253dd</id>
<content type='text'>
Conflicts:
	install/install.sh
</content>
</entry>
<entry>
<title>Install script: add media/upload dir</title>
<updated>2016-07-16T15:23:22+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-07-16T15:23:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=ea7a58f325f0920e000ba72eefe4d4d69f4e838e'/>
<id>urn:sha1:ea7a58f325f0920e000ba72eefe4d4d69f4e838e</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'v0.9' into wheezy</title>
<updated>2016-07-14T16:37:22+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-07-14T16:37:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=9aca92fb0044d9665c69e6ec36bd8bb69ef1829f'/>
<id>urn:sha1:9aca92fb0044d9665c69e6ec36bd8bb69ef1829f</id>
<content type='text'>
</content>
</entry>
</feed>
