]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93cdb6a 1edd898)
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)
Conflicts:
timeside/server/management/commands/timeside-tests-boilerplate.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.