]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06e4f1b 2ce4fcf)
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Sat, 21 Jun 2014 16:04:36 +0000 (18:04 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sat, 21 Jun 2014 16:04:36 +0000 (18:04 +0200)

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