]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e00bfc 8b70d50)
Merge branch 'crfpa' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 29 Jan 2015 17:20:13 +0000 (18:20 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 29 Jan 2015 17:20:13 +0000 (18:20 +0100)

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