<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Chimère/chimere, branch v1.1.0</title>
<subtitle>Application en ligne collaborative qui agrège des données géographiques</subtitle>
<id>http://git.iggdrasil.net/Chimère/atom?h=v1.1.0</id>
<link rel='self' href='http://git.iggdrasil.net/Chimère/atom?h=v1.1.0'/>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/'/>
<updated>2011-02-04T01:52:55+00:00</updated>
<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>Correct 404 and 500 pages</title>
<updated>2010-12-13T11:49:27+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-13T11:49:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=c5e865bc70b824db3c547c3da2f559d6c78cfbec'/>
<id>urn:sha1:c5e865bc70b824db3c547c3da2f559d6c78cfbec</id>
<content type='text'>
</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-13T10:23:51+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-13T10:23:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=d9403e673086e8bc5a68d65deec3751ed2f261e7'/>
<id>urn:sha1:d9403e673086e8bc5a68d65deec3751ed2f261e7</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Correct a bad cleaning of the source code.</title>
<updated>2010-12-13T10:21:48+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-13T10:21:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=2cb48fb94cbd43226b279f45d87840130ee44236'/>
<id>urn:sha1:2cb48fb94cbd43226b279f45d87840130ee44236</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:18:41+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-10T11:18:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=29e8ae5f72fb31d89ef0d5bab7ad7c9454c8f5fd'/>
<id>urn:sha1:29e8ae5f72fb31d89ef0d5bab7ad7c9454c8f5fd</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Minor comestic correction</title>
<updated>2010-12-10T11:18:16+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2010-12-10T11:18:16+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=f0624fb7b0ac1bde94db944d35e97c6747c7d109'/>
<id>urn:sha1:f0624fb7b0ac1bde94db944d35e97c6747c7d109</id>
<content type='text'>
</content>
</entry>
</feed>
