]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b84566 e0843b2)
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 19 May 2014 13:41:39 +0000 (15:41 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 19 May 2014 13:41:39 +0000 (15:41 +0200)

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