<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Ishtar/ishtar_common/templates/ishtar/merge_organization.html, branch v3.2</title>
<subtitle>Logiciel de gestion et d'inventaire en archéologie</subtitle>
<id>http://git.iggdrasil.net/Ishtar/atom?h=v3.2</id>
<link rel='self' href='http://git.iggdrasil.net/Ishtar/atom?h=v3.2'/>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/'/>
<updated>2022-09-27T15:18:20+00:00</updated>
<entry>
<title>Merge page - add more fields on table (refs #5447)</title>
<updated>2022-09-27T15:18:20+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2022-09-27T15:13:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=69b20d50aed1e20cb3a76652fac671efea4e3991'/>
<id>urn:sha1:69b20d50aed1e20cb3a76652fac671efea4e3991</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Django 1.8: removing "load url from future" we are in the future</title>
<updated>2017-04-18T11:40:28+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2017-04-18T11:40:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=f4d6be02a756865b951d94fa8e9cd5866dcea7de'/>
<id>urn:sha1:f4d6be02a756865b951d94fa8e9cd5866dcea7de</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Switch to font-awesome for icons</title>
<updated>2016-07-07T18:28:33+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-07-07T18:28:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=89a89e9c1dcc072d2d435d57d4eb1761b94099c7'/>
<id>urn:sha1:89a89e9c1dcc072d2d435d57d4eb1761b94099c7</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge: display address for persons and organizations</title>
<updated>2016-01-13T12:01:06+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-01-13T12:01:06+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=a2312380213fb30b88da6115663d8f9d72aced7b'/>
<id>urn:sha1:a2312380213fb30b88da6115663d8f9d72aced7b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge action implementation (person and organization)</title>
<updated>2014-11-28T10:30:02+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@proxience.com</email>
</author>
<published>2014-11-28T10:30:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Ishtar/commit/?id=a62abdcb0c6daa71bc8bef293c20d911a63ccc60'/>
<id>urn:sha1:a62abdcb0c6daa71bc8bef293c20d911a63ccc60</id>
<content type='text'>
</content>
</entry>
</feed>
