]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into feature/scores
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 13 Jul 2015 10:50:57 +0000 (12:50 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 13 Jul 2015 10:50:57 +0000 (12:50 +0200)
commit9ae469aa5d40102c62489f3781f52c8b460127f2
tree482179d8090062f1cf63f70d21eb80dc1aa068f3
parent7b8c732d12b14731ccf358616a3fa36964e9f18b
parentb446633691b972b1be2b80e993ad7caa3ea4c6af
Merge branch 'dev' into feature/scores

Conflicts:
teleforma/models/core.py
teleforma/templates/postman/view.html
teleforma/models/core.py
teleforma/templates/postman/view.html