git.parisson.com Git - teleforma.git/commit

]> git.parisson.com Git - teleforma.git/commit

author	Guillaume Pellerin <yomguy@parisson.com>
	Thu, 22 Aug 2013 13:05:12 +0000 (15:05 +0200)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Thu, 22 Aug 2013 13:05:12 +0000 (15:05 +0200)
commit	92a7f32468d537c1eb03551be8c9e46bfe6610bb
tree	4420140d3f980be84a363e96be5dc846f4e9dd47	tree \| snapshot
parent	334366ab08e36888884ed3479f80eb3e0c5e2da1	commit \| diff
parent	07b37121398e44bc70e0d03cc420c46a7cfc68a5	commit \| diff

Merge branch 'crfpa' into ae-dev

Conflicts:
teleforma/admin.py
teleforma/locale/fr/LC_MESSAGES/django.mo
teleforma/locale/fr/LC_MESSAGES/django.po
teleforma/models/core.py
teleforma/templates/postman/email_user_init.txt
teleforma/templates/teleforma/course_conference.html
teleforma/templates/teleforma/course_conference_audio.html
teleforma/templates/teleforma/course_detail.html
teleforma/templates/teleforma/course_media.html
teleforma/templates/teleforma/courses.html
teleforma/views/core.py
teleforma/views/crfpa.py

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

teleforma/admin.py	diff1 \|	diff2 \|	blob \| history
teleforma/locale/fr/LC_MESSAGES/django.mo	diff1 \|	diff2 \|	blob \| history
teleforma/locale/fr/LC_MESSAGES/django.po	diff1 \|	diff2 \|	blob \| history
teleforma/management/commands/teleforma-import-conferences.py	diff1 \|	diff2 \|	blob \| history
teleforma/models/core.py	diff1 \|	diff2 \|	blob \| history
teleforma/templates/postman/base_write.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/postman/email_user_init.txt	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/course_detail.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/course_media.html	diff1 \|	diff2 \|	blob \| history
teleforma/views/core.py	diff1 \|	diff2 \|	blob \| history
teleforma/views/crfpa.py	diff1 \|	diff2 \|	blob \| history