]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d45404d 127e36c)
Merge branch 'prodev' of git+ssh://vcs.parisson.com/var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 2 Jan 2014 11:02:23 +0000 (12:02 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 2 Jan 2014 11:02:23 +0000 (12:02 +0100)

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