]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd7ea8f 3970be0)
Merge branch 'feature/blue' into dev
authoryomguy <yomguy@parisson.com>
Fri, 6 Jul 2012 13:53:25 +0000 (15:53 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 6 Jul 2012 13:53:25 +0000 (15:53 +0200)

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