]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' of git.parisson.com:git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 30 Sep 2020 10:30:22 +0000 (12:30 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 30 Sep 2020 10:30:22 +0000 (12:30 +0200)
commit9e9d1538cef4ca5accf422de7936faaa078bd101
tree31a5e8c07cc20a2230fb407c76aa2f11e70d2fd0
parente2053915bcff16c8c07009754b05a63f63d5990f
parentbfbe9355550cf4b8c06a1eefdcdb3da2856528c9
Merge branch 'prodev' of git.parisson.com:git/teleforma into prodev

Conflicts:
teleforma/management/commands/teleforma-copy-seminars.py
teleforma/management/commands/teleforma-copy-seminars.py