]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev' into feature/wave
authorThomas Fillon <thomas@parisson.com>
Fri, 6 Mar 2015 19:57:30 +0000 (20:57 +0100)
committerThomas Fillon <thomas@parisson.com>
Fri, 6 Mar 2015 19:57:30 +0000 (20:57 +0100)
commit086b5637ace22c41c6d9875876afc4940748fa71
treee121baae5936a6de54dc0239d45995738511c71d
parent93cdb6af749d37b806d8ac4005bd6673a214c452
parent1edd89839cc7efca3b27b76f85eae4f3cc2ff0ca
Merge branch 'dev' into feature/wave

Conflicts:
timeside/server/management/commands/timeside-tests-boilerplate.py