]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66180a0 6d599c3)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 10:44:35 +0000 (11:44 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 10:44:35 +0000 (11:44 +0100)

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