]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' into tc202
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Jul 2013 00:58:10 +0000 (02:58 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 12 Jul 2013 00:58:10 +0000 (02:58 +0200)
commit27e19621e5bce5b6a4e0ca3be97c436b8b820341
tree09ad8378467d39c2b3f71921469a884e61f9aae8
parent50c34596e30fe51175ec172b6e3a40e6e7284c59
parent1c022060da6043e6fdecc1949ebe6e529a6fe48e
Merge branch 'crfpa' into tc202

Conflicts:
teleforma/locale/fr/LC_MESSAGES/django.mo
teleforma/views/core.py
example/settings.py
teleforma/locale/fr/LC_MESSAGES/django.mo
teleforma/locale/fr/LC_MESSAGES/django.po
teleforma/templates/teleforma/course_conference_record.html
teleforma/templates/teleforma/course_detail.html
teleforma/views/core.py