<feed xmlns='http://www.w3.org/2005/Atom'>
<title>Papillon/papillon/templates, branch w-ana</title>
<subtitle></subtitle>
<id>http://git.iggdrasil.net/Papillon/atom?h=w-ana</id>
<link rel='self' href='http://git.iggdrasil.net/Papillon/atom?h=w-ana'/>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/'/>
<updated>2016-04-18T15:50:12+00:00</updated>
<entry>
<title>modification dans models.py liÃ©e Ã  python 3 : unicode devient str</title>
<updated>2016-04-18T15:50:12+00:00</updated>
<author>
<name>Ana</name>
<email>ana.charpentier@free.fr</email>
</author>
<published>2016-04-18T15:50:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=564379c0aea3106490d27e239567134d42325c30'/>
<id>urn:sha1:564379c0aea3106490d27e239567134d42325c30</id>
<content type='text'>
modifs des imports dans forms et admin
</content>
</entry>
<entry>
<title>modifs dans les templates :</title>
<updated>2016-04-18T14:30:06+00:00</updated>
<author>
<name>Ana</name>
<email>ana.charpentier@free.fr</email>
</author>
<published>2016-04-18T14:30:06+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=194591ef1c78ac694266a83231848019023a3fcf'/>
<id>urn:sha1:194591ef1c78ac694266a83231848019023a3fcf</id>
<content type='text'>
-suppression de load markup
-il manquait un csrf dans vote.html
-correction de l'anglais dans main.html
</content>
</entry>
<entry>
<title>deplacement des templates dans polls/templates/polls/</title>
<updated>2016-04-18T13:55:44+00:00</updated>
<author>
<name>Ana</name>
<email>ana.charpentier@free.fr</email>
</author>
<published>2016-04-18T13:55:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=082ded5ae1c4b999c29e1f68d484ec1effbaa057'/>
<id>urn:sha1:082ded5ae1c4b999c29e1f68d484ec1effbaa057</id>
<content type='text'>
</content>
</entry>
<entry>
<title>CSS: fix help text in edit choices table</title>
<updated>2016-03-25T18:12:46+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-03-25T18:12:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=d60eef36a023f45224a9b52d17324ab4c1013c47'/>
<id>urn:sha1:d60eef36a023f45224a9b52d17324ab4c1013c47</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Improve edit pages layout</title>
<updated>2016-03-25T17:57:04+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-03-25T17:56:45+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=b7e85715fd5649b96a93bbf6d13f6ef71b719d8c'/>
<id>urn:sha1:b7e85715fd5649b96a93bbf6d13f6ef71b719d8c</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'responsive' of https://github.com/Trim/papillon into responsive</title>
<updated>2016-03-25T17:43:47+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-03-25T17:43:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=1fe6a52803b4d78f57f52cdbe138010cc4c00f80'/>
<id>urn:sha1:1fe6a52803b4d78f57f52cdbe138010cc4c00f80</id>
<content type='text'>
Conflicts:
	papillon/templates/base.html
</content>
</entry>
<entry>
<title>Fix static / media mix</title>
<updated>2016-03-25T17:39:21+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-03-25T17:39:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=3fcdf69304580650c6244165aae0b1fc46221cff'/>
<id>urn:sha1:3fcdf69304580650c6244165aae0b1fc46221cff</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'django-1.5' of https://github.com/Trim/papillon into v0.5</title>
<updated>2016-03-25T15:52:00+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@iggdrasil.net</email>
</author>
<published>2016-03-25T15:52:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=e3c65fd09d849225f2173a310cbbce39c08fd71b'/>
<id>urn:sha1:e3c65fd09d849225f2173a310cbbce39c08fd71b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Add 500 template - better gitignore</title>
<updated>2013-11-14T19:05:51+00:00</updated>
<author>
<name>Étienne Loks</name>
<email>etienne.loks@peacefrogs.net</email>
</author>
<published>2013-11-14T19:05:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=80528d61b1c7d5a3c1255d302fb7f2b388624bdb'/>
<id>urn:sha1:80528d61b1c7d5a3c1255d302fb7f2b388624bdb</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fix bug with newest django 1.5 url function (forgott before)</title>
<updated>2013-08-08T23:44:53+00:00</updated>
<author>
<name>Adrien Dorsaz</name>
<email>adrien@adorsaz.ch</email>
</author>
<published>2013-08-08T22:37:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.iggdrasil.net/Papillon/commit/?id=dbf0a5632319733d8fbdbdff2fb85f5026a02c7a'/>
<id>urn:sha1:dbf0a5632319733d8fbdbdff2fb85f5026a02c7a</id>
<content type='text'>
</content>
</entry>
</feed>
