]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb6bf49 10653e5)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 12 Nov 2013 13:34:27 +0000 (14:34 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 12 Nov 2013 13:34:27 +0000 (14:34 +0100)

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