]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46def40 f31b33d)
Merge branch 'dev' into crfpa
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Feb 2015 09:56:29 +0000 (10:56 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Feb 2015 09:56:29 +0000 (10:56 +0100)

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