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: c728d9f 3e9b78b)

author	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Wed, 19 Jul 2017 09:54:41 +0000 (11:54 +0200)
committer	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Wed, 19 Jul 2017 09:54:41 +0000 (11:54 +0200)
commit	d02d689dcef12d221af64efb98a98acae4d138a8
tree	266971a3d06e2b4199d3d91a8fe7e95f9893bcef	tree \| snapshot
parent	c728d9f8c5a5da02158181ae4997261710490521	commit \| diff
parent	3e9b78bfa73370fcfe8128cc772a281974f91101	commit \| diff

Merge branch 'dev' into tc202

14 files changed:

example/settings.py	diff1 \|	diff2 \|	blob \| history
teleforma/admin.py	diff1 \|	diff2 \|	blob \| history
teleforma/locale/fr/LC_MESSAGES/django.po	diff1 \|	diff2 \|	blob \| history
teleforma/management/commands/teleforma-export-stream-m-slugs.py	diff1 \|	diff2 \|	blob \| history
teleforma/management/commands/teleforma-import-conferences.py	diff1 \|	diff2 \|	blob \| history
teleforma/models/core.py	diff1 \|	diff2 \|	blob \| history
teleforma/pages/fr/help.rst	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_document.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/course_media.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/telemeta/base.html	diff1 \|	diff2 \|	blob \| history
teleforma/templatetags/teleforma_tags.py	diff1 \|	diff2 \|	blob \| history
teleforma/views/core.py	diff1 \|	diff2 \|	blob \| history

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