]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7c2345 feaf046)
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Feb 2016 00:58:45 +0000 (01:58 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Feb 2016 00:58:45 +0000 (01:58 +0100)

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