]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b659ba 54f8dac)
Merge branch 'feature/docker-compose' into feature/wave
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Mar 2015 10:35:21 +0000 (11:35 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Mar 2015 10:35:21 +0000 (11:35 +0100)
Conflicts:
timeside/server/templates/timeside/index.html
timeside/server/templates/timeside/item_detail.html


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