]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c7a2c1 a58a5e1)
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Sep 2014 16:55:47 +0000 (18:55 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 2 Sep 2014 16:55:47 +0000 (18:55 +0200)

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