]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6f4acb b6dd036)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 17 Oct 2013 01:03:01 +0000 (03:03 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 17 Oct 2013 01:03:01 +0000 (03:03 +0200)
Conflicts:
README.rst


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