]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ca9b8d 8a6c48a)
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 20:47:04 +0000 (21:47 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Dec 2013 20:47:04 +0000 (21:47 +0100)

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