]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4dbcd4 ee8544f)
Merge branch 'hotfix/manifest' into dev
authoryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 14:10:29 +0000 (16:10 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 14:10:29 +0000 (16:10 +0200)

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