]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into tc202-dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 21 Jan 2019 16:24:19 +0000 (17:24 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 21 Jan 2019 16:24:19 +0000 (17:24 +0100)
commitb730efcd43d937249c83298ef81cd835e464882f
treee7d0062deefd7c18a6bb571506ce7ce879e554e0
parentb8b56c2bf0b9abf235916e5470ce1d7ae4d2f450
parent345b02aa7b010b856ad6c692c6eef219553e4992
Merge branch 'dev' into tc202-dev
example/settings.py
teleforma/admin.py
teleforma/locale/fr/LC_MESSAGES/django.po
teleforma/models/core.py
teleforma/models/crfpa.py
teleforma/templates/teleforma/course_detail.html
teleforma/templates/teleforma/course_media.html
teleforma/templates/telemeta/base.html
teleforma/templatetags/teleforma_tags.py
teleforma/views/core.py