]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 380243a 0dadd91)
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 21 Feb 2014 16:49:24 +0000 (17:49 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 21 Feb 2014 16:49:24 +0000 (17:49 +0100)

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