Merge branch 'master' of git.parisson.com:git/teleforma

author Guillaume Pellerin <yomguy@parisson.com>

Wed, 22 Jul 2020 07:29:59 +0000 (09:29 +0200)

committer Guillaume Pellerin <yomguy@parisson.com>

Wed, 22 Jul 2020 07:29:59 +0000 (09:29 +0200)
author Guillaume Pellerin <yomguy@parisson.com>
Wed, 22 Jul 2020 07:29:59 +0000 (09:29 +0200)
committer Guillaume Pellerin <yomguy@parisson.com>
Wed, 22 Jul 2020 07:29:59 +0000 (09:29 +0200)
diff --cc teleforma/templates/teleforma/course_media.html
Simple merge
diff --cc teleforma/templates/teleforma/inc/media_list.html
Simple merge
author	Guillaume Pellerin <yomguy@parisson.com>
	Wed, 22 Jul 2020 07:29:59 +0000 (09:29 +0200)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Wed, 22 Jul 2020 07:29:59 +0000 (09:29 +0200)
		1	2
teleforma/templates/teleforma/course_media.html	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/inc/media_list.html	patch \|	diff1 \|	diff2 \|	blob \| history