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: 917e021 1190de2)

author	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Tue, 17 Dec 2019 00:25:39 +0000 (01:25 +0100)
committer	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Tue, 17 Dec 2019 00:25:39 +0000 (01:25 +0100)
commit	453615eba28fd6e7759819c809e2f5be231d4b54
tree	59b9cf198207377268fab44bbe1d41fc456d35ec	tree \| snapshot
parent	917e0212fb97ac8a95386ff1b0e7f7e6690c8d33	commit \| diff
parent	1190de2b1ddcb8eee0bd7445ab6ae4ead2711816	commit \| diff

Merge branch 'dev' into docker

15 files changed:

app/settings.py	diff1 \|	diff2 \|	blob \| history
teleforma/admin.py	diff1 \|	diff2 \|	blob \| history
teleforma/exam/models.py	diff1 \|	diff2 \|	blob \| history
teleforma/models/crfpa.py	diff1 \|	diff2 \|	blob \| history
teleforma/south_migrations/0115_auto__add_field_conference_streaming.py	\|	\|	blob
teleforma/south_migrations/0116_auto__add_field_training_platform_only.py	\|	\|	blob
teleforma/south_migrations/0117_auto__add_parameters__add_field_period_date_inscription_start__add_fie.py	\|	\|	blob
teleforma/south_migrations/0117_auto__del_field_payment_collected__add_field_payment_scheduled__add_fi.py	\|	\|	blob
teleforma/templates/postman/base_write.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/postman/view.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/registration/registration_complete.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/course_media.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/inc/conference_list.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/inc/newsitems_portlet.html	diff1 \|	diff2 \|	blob \| history
teleforma/templates/telemeta/profile_detail.html	diff1 \|	diff2 \|	blob \| history

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