<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Chimère/chimere/templates/welcome.html, branch develop</title>
<subtitle>Application en ligne collaborative qui agrège des données géographiques</subtitle>
<id>http://git.iggdrasil.net/Chimère/atom?h=develop</id>
<link rel='self' href='http://git.iggdrasil.net/Chimère/atom?h=develop'/>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/'/>
<updated>2012-02-16T07:46:47+00:00</updated>
<entry>
<title>Refactoring: change paths, move files, renaming, re-adapt templates + use context template (refs #316)</title>
<updated>2012-02-16T07:46:47+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2012-02-16T07:46:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=d8c670233cb6b14fc405d04f009e0959710910a6'/>
<id>urn:sha1:d8c670233cb6b14fc405d04f009e0959710910a6</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Correct welcome page for a vanilla installation</title>
<updated>2011-06-04T18:15:33+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2011-06-04T18:15:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=3818d66f0354f54e73f36bd3e1524905241c2be1'/>
<id>urn:sha1:3818d66f0354f54e73f36bd3e1524905241c2be1</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Clean specific data</title>
<updated>2011-02-04T01:52:55+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2011-02-04T01:52:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=22758aade5c2ddd37542af3c2d9b6f9bc313e9f8'/>
<id>urn:sha1:22758aade5c2ddd37542af3c2d9b6f9bc313e9f8</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into carte-ouverte</title>
<updated>2010-12-13T11:50:56+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-13T11:50:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=b738eab0a438f34aa67a0eb35ad1a7c5866ce6b2'/>
<id>urn:sha1:b738eab0a438f34aa67a0eb35ad1a7c5866ce6b2</id>
<content type='text'>
Conflicts:

	chimere/templates/404.html
	chimere/templates/500.html
</content>
</entry>
<entry>
<title>Allow target attribute for link in descriptions (closes #289)</title>
<updated>2010-12-13T11:47:14+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-13T11:47:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=6039e8b31fefc499499f82b5e5f31caea1f55be6'/>
<id>urn:sha1:6039e8b31fefc499499f82b5e5f31caea1f55be6</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into carte-ouverte</title>
<updated>2010-12-10T18:28:32+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-10T18:28:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=946e9655eb363e1de6446d173ee89e176429c36f'/>
<id>urn:sha1:946e9655eb363e1de6446d173ee89e176429c36f</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Allow more tag (&lt;span style&gt;, &lt;strong&gt;, &lt;em&gt;, &lt;hr&gt;) in the sanitisation (refs #288)</title>
<updated>2010-12-10T18:25:03+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-10T18:25:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=d73730bfc9730a330f327c3d4c382b30c90e9eb1'/>
<id>urn:sha1:d73730bfc9730a330f327c3d4c382b30c90e9eb1</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into carte-ouverte</title>
<updated>2010-12-10T11:07:39+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-10T11:07:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=1460cc1884f293d8e4aec0f7a3b730392fe0f087'/>
<id>urn:sha1:1460cc1884f293d8e4aec0f7a3b730392fe0f087</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Allow more tag (&lt;i&gt; &lt;br&gt;) in the sanitisation (closes #288)</title>
<updated>2010-12-10T11:05:48+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-10T11:05:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=96bdff60f069be30fa0d720bc305936ccb70a677'/>
<id>urn:sha1:96bdff60f069be30fa0d720bc305936ccb70a677</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into carte-ouverte</title>
<updated>2010-11-27T18:13:12+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-11-27T18:13:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=f5a4e1ba6a72ce003c896524be3a0c8179e91c36'/>
<id>urn:sha1:f5a4e1ba6a72ce003c896524be3a0c8179e91c36</id>
<content type='text'>
</content>
</entry>
</feed>
