]> git.parisson.com Git - teleforma.git/commit
Merge branch 'docker' into tc202-dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Feb 2019 01:23:33 +0000 (02:23 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Feb 2019 01:23:33 +0000 (02:23 +0100)
commit6fa8931e316097d2611b2b8b22867b43a5683cc4
tree0691c09952751803ed1fe39c919ae52d47922530
parent8721b5bbd059960453d0e3a18f625113bb297386
parent207cc5de13f52ff084a7c3ec865e0b47cdbea2af
Merge branch 'docker' into tc202-dev
teleforma/templates/teleforma/course_conference_audio.html
teleforma/templates/teleforma/course_conference_record.html
teleforma/templates/teleforma/course_detail.html
teleforma/templates/teleforma/course_document.html
teleforma/templates/teleforma/course_media.html
teleforma/templates/teleforma/inc/conference_list.html
teleforma/templates/telemeta/base.html