]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' of /var/git/teleforma into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 27 Apr 2017 14:30:06 +0000 (16:30 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 27 Apr 2017 14:30:06 +0000 (16:30 +0200)
commit03053257dd53d85ecc3c652f22b3af16fbd4feab
treeb98d0e785b05041cfbe9c812779adf6d6560d912
parente1f561656c9bec822617f564e85dfcc30f9485cb
parent8afe211974e14073cbd00c9e91722e42e8e00dde
Merge branch 'dev' of /var/git/teleforma into dev

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