Ishtar/ishtar_common/templates/ishtar/merge.html, branch v1.0-develop Logiciel de gestion et d'inventaire en archéologie http://git.iggdrasil.net/Ishtar/atom?h=v1.0-develop 2016-07-07T18:28:33+00:00 Switch to font-awesome for icons 2016-07-07T18:28:33+00:00 Étienne Loks etienne.loks@iggdrasil.net 2016-07-07T18:28:33+00:00 urn:sha1:89a89e9c1dcc072d2d435d57d4eb1761b94099c7 Merge action implementation (person and organization) 2014-11-28T10:30:02+00:00 Étienne Loks etienne.loks@proxience.com 2014-11-28T10:30:02+00:00 urn:sha1:a62abdcb0c6daa71bc8bef293c20d911a63ccc60