]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d28e4ba be7091b)
Merge branch 'dev-server-TM' into feature/docker-compose
authorThomas Fillon <thomas@parisson.com>
Tue, 3 Mar 2015 17:09:18 +0000 (18:09 +0100)
committerThomas Fillon <thomas@parisson.com>
Tue, 3 Mar 2015 17:09:18 +0000 (18:09 +0100)
1  2 
timeside/server/views.py patch | diff1 | diff2 | blob | history

diff --cc timeside/server/views.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.