Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into media-related-object

author Emilie <zawadzki@ircam.fr>

Thu, 3 Nov 2016 10:58:59 +0000 (11:58 +0100)

committer Emilie <zawadzki@ircam.fr>

Thu, 3 Nov 2016 10:58:59 +0000 (11:58 +0100)
author Emilie <zawadzki@ircam.fr>
Thu, 3 Nov 2016 10:58:59 +0000 (11:58 +0100)
committer Emilie <zawadzki@ircam.fr>
Thu, 3 Nov 2016 10:58:59 +0000 (11:58 +0100)
diff --cc app/templates/magazine/topic/topic_detail.html
Simple merge
author	Emilie <zawadzki@ircam.fr>
	Thu, 3 Nov 2016 10:58:59 +0000 (11:58 +0100)
committer	Emilie <zawadzki@ircam.fr>
	Thu, 3 Nov 2016 10:58:59 +0000 (11:58 +0100)