]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b33c8fa 1ffe5f1)
Merge branch 'pro' into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Jun 2013 11:10:45 +0000 (13:10 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Jun 2013 11:10:45 +0000 (13:10 +0200)

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