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

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

projects / teleforma.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 915d928 09234bf)

author	Guillaume Pellerin <yomguy@parisson.com>
	Thu, 11 Jul 2013 15:59:43 +0000 (17:59 +0200)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Thu, 11 Jul 2013 15:59:43 +0000 (17:59 +0200)
commit	05e645131ac8ef8ee518f914533d7db5651593b4
tree	c56b49592585a077f8905f723fa90659db8989e4	tree \| snapshot
parent	915d92812b40193f3d420364659955401e626dc4	commit \| diff
parent	09234bfb1d8c595c12624743ba2849cbd2a02379	commit \| diff

Merge branch 'crfpa' into tc202dev

Conflicts:
teleforma/locale/fr/LC_MESSAGES/django.mo

14 files changed:

teleforma/admin.py	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/email_user_init.txt	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/course_conference.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/course_conference_audio.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/course_conference_record.html	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/templates/teleforma/inc/media_list.html	diff1 \|	diff2 \|	blob \| history
teleforma/templatetags/teleforma_tags.py	diff1 \|	diff2 \|	blob \| history
teleforma/views/core.py	diff1 \|	diff2 \|	blob \| history
teleforma/views/crfpa.py	diff1 \|	diff2 \|	blob \| history

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