]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffea475 40fa071)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 24 Jun 2014 23:21:15 +0000 (01:21 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 24 Jun 2014 23:21:15 +0000 (01:21 +0200)

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