]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d79c7b6 ae5a781)
Merge branch 'dev' into diadems
authorThomas Fillon <thomas@parisson.com>
Thu, 19 Jun 2014 12:01:34 +0000 (14:01 +0200)
committerThomas Fillon <thomas@parisson.com>
Thu, 19 Jun 2014 12:01:34 +0000 (14:01 +0200)

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