]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb35162 2da898e)
Merge branch 'feature/telecaster' into dev
authoryomguy <yomguy@parisson.com>
Thu, 12 Jul 2012 14:50:35 +0000 (16:50 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 12 Jul 2012 14:50:35 +0000 (16:50 +0200)

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