]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into feature/webclass feature/webclass
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Apr 2020 22:25:21 +0000 (00:25 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Apr 2020 22:25:21 +0000 (00:25 +0200)
commitec7c50587b47231c672ba4812d96fb0cb3d385f6
tree254f1177fed7cddbcb3d27744930017ee15f12bc
parent3a1d50a8296457697d718bfb497bf52a9d661d2a
parentd741ecdc5ef5152d65ed9ae8e730d5dec3b81539
Merge branch 'dev' into feature/webclass
teleforma/admin.py
teleforma/models/core.py
teleforma/models/crfpa.py
teleforma/templates/teleforma/course_media.html
teleforma/templates/teleforma/inc/conference_list.html
teleforma/templatetags/teleforma_tags.py
teleforma/views/core.py