]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5242ce0 4c739f3)
Merge branch 'pro' into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 21 Jul 2014 14:43:02 +0000 (16:43 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 21 Jul 2014 14:43:02 +0000 (16:43 +0200)

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