]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8be0b78 b8e3047)
Merge branch 'prodev' into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Jun 2014 20:10:24 +0000 (22:10 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Jun 2014 20:10:24 +0000 (22:10 +0200)

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