Merge branch 'ae-merge-crfpa' into ae

author Yoan Le Clanche <yoanl@pilotsystems.net>

Mon, 31 May 2021 09:36:22 +0000 (11:36 +0200)

committer Yoan Le Clanche <yoanl@pilotsystems.net>

Mon, 31 May 2021 09:36:22 +0000 (11:36 +0200)
author Yoan Le Clanche <yoanl@pilotsystems.net>
Mon, 31 May 2021 09:36:22 +0000 (11:36 +0200)
committer Yoan Le Clanche <yoanl@pilotsystems.net>
Mon, 31 May 2021 09:36:22 +0000 (11:36 +0200)
diff --cc teleforma/management/commands/teleforma-import-conferences.py
Simple merge
diff --cc teleforma/templates/teleforma/inc/media_list.html
Simple merge
author	Yoan Le Clanche <yoanl@pilotsystems.net>
	Mon, 31 May 2021 09:36:22 +0000 (11:36 +0200)
committer	Yoan Le Clanche <yoanl@pilotsystems.net>
	Mon, 31 May 2021 09:36:22 +0000 (11:36 +0200)
		1	2
teleforma/management/commands/teleforma-import-conferences.py	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/inc/media_list.html	patch \|	diff1 \|	diff2 \|	blob \| history