]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96c9694 ccdb70e)
Merge remote-tracking branch 'upstream/dev' into dev
authorDavid Doukhan <david.doukhan@gmail.com>
Fri, 24 Jan 2014 17:41:27 +0000 (18:41 +0100)
committerDavid Doukhan <david.doukhan@gmail.com>
Fri, 24 Jan 2014 17:41:27 +0000 (18:41 +0100)

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