<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Chimère/chimere/static, branch v2.3</title>
<subtitle>Application en ligne collaborative qui agrège des données géographiques</subtitle>
<id>http://git.iggdrasil.net/Chimère/atom?h=v2.3</id>
<link rel='self' href='http://git.iggdrasil.net/Chimère/atom?h=v2.3'/>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/'/>
<updated>2016-11-07T11:24:33+00:00</updated>
<entry>
<title>Copy OpenStreetMap.js from openstreetmap</title>
<updated>2016-11-07T11:24:33+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-11-07T11:24:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=1dcf7ca038bc4c989b0b3fab121c5281ee23688b'/>
<id>urn:sha1:1dcf7ca038bc4c989b0b3fab121c5281ee23688b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Add tile.stamen.js to repository (https issue: only available from http)</title>
<updated>2016-08-02T12:47:08+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-08-02T12:47:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=d5312427df0030cdc02387ee06f1c6fb835c4de3'/>
<id>urn:sha1:d5312427df0030cdc02387ee06f1c6fb835c4de3</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'v2.2'</title>
<updated>2015-02-27T00:55:08+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@proxience.com</email>
</author>
<published>2015-02-27T00:55:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=1da288964f2d2279339fd9224bd31831526f6e4d'/>
<id>urn:sha1:1da288964f2d2279339fd9224bd31831526f6e4d</id>
<content type='text'>
Conflicts:
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
</content>
</entry>
<entry>
<title>Merge branch 'v2.1' into v2.2</title>
<updated>2015-02-27T00:47:59+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@proxience.com</email>
</author>
<published>2015-02-27T00:47:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=403bb16d02db6aca31e63d1be147594dda28d703'/>
<id>urn:sha1:403bb16d02db6aca31e63d1be147594dda28d703</id>
<content type='text'>
</content>
</entry>
<entry>
<title>JS: manage the saving of route with many steps</title>
<updated>2015-02-27T00:46:40+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@proxience.com</email>
</author>
<published>2015-02-27T00:46:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=1242868c7eb1cd9da6f4001e2e98d4369d24ba15'/>
<id>urn:sha1:1242868c7eb1cd9da6f4001e2e98d4369d24ba15</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Change default pan for openlayers</title>
<updated>2015-02-25T16:55:18+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@proxience.com</email>
</author>
<published>2015-02-25T16:55:18+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=9d9d44856a1a16de8b6d73e216875bffdf4f4178'/>
<id>urn:sha1:9d9d44856a1a16de8b6d73e216875bffdf4f4178</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Move share bar</title>
<updated>2015-02-25T10:36:39+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@proxience.com</email>
</author>
<published>2015-02-25T10:36:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=1c0e144df5c08a274ee6b9713ff8b77886e414e1'/>
<id>urn:sha1:1c0e144df5c08a274ee6b9713ff8b77886e414e1</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'v2.2'</title>
<updated>2015-02-25T01:40:38+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@proxience.com</email>
</author>
<published>2015-02-25T01:40:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=3dca534692d18ba7bfc0db6c0e2ba4aedcaef2b0'/>
<id>urn:sha1:3dca534692d18ba7bfc0db6c0e2ba4aedcaef2b0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Minor style</title>
<updated>2015-02-25T01:27:54+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@proxience.com</email>
</author>
<published>2015-02-25T01:27:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=9865507a74c02e935d47b31c3b51bbe7e9c30b7f'/>
<id>urn:sha1:9865507a74c02e935d47b31c3b51bbe7e9c30b7f</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'v2.2'</title>
<updated>2015-02-24T19:53:20+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@proxience.com</email>
</author>
<published>2015-02-24T19:53:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Chimère/commit/?id=3c77ed9aa9b4f2c1f594f221eac9d7c03a4755be'/>
<id>urn:sha1:3c77ed9aa9b4f2c1f594f221eac9d7c03a4755be</id>
<content type='text'>
Conflicts:
	chimere/static/chimere/css/styles.css
	chimere/templates/chimere/blocks/areas.html
</content>
</entry>
</feed>
