]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ad4f33 e4ee65f)
Merge branch 'pro' into dev
authoryomguy <yomguy@parisson.com>
Wed, 31 Oct 2012 15:14:59 +0000 (16:14 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 31 Oct 2012 15:14:59 +0000 (16:14 +0100)

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