]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6eb1339 e9cc4d6)
Merge branch 'dev' of github.com:Parisson/Telemeta into feature/haystack
authorafilsaime <shadow_kungfu@hotmail.fr>
Thu, 30 Apr 2015 12:10:23 +0000 (14:10 +0200)
committerafilsaime <shadow_kungfu@hotmail.fr>
Thu, 30 Apr 2015 12:10:23 +0000 (14:10 +0200)

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