]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' of /var/git/teleforma into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 22 Jan 2016 17:25:16 +0000 (18:25 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 22 Jan 2016 17:25:16 +0000 (18:25 +0100)
commitb1dfe73616f5d4bf348ca90c56ac2f83fd4584da
tree680ab202f6ca2302ef53a7f6768311064c3626b7
parent239bea27a31dc087f2523cbccb76c30c3aae4d26
parent769ba7fac57c8baba9a96413c1cfa5186424922a
Merge branch 'crfpa' of /var/git/teleforma into dev

Conflicts:
teleforma/admin.py
teleforma/admin.py