]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b75a4df f7ff54d)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 20 Oct 2013 16:34:49 +0000 (18:34 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 20 Oct 2013 16:34:49 +0000 (18:34 +0200)

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