]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fed403 ef99545)
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 20 May 2014 10:01:37 +0000 (12:01 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 20 May 2014 10:01:37 +0000 (12:01 +0200)

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