]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e2b9f1 f732752)
Fix conflict
authorPhilippe Barbosa <contact@philippebarbosa.com>
Wed, 23 Mar 2016 18:10:53 +0000 (19:10 +0100)
committerPhilippe Barbosa <contact@philippebarbosa.com>
Wed, 23 Mar 2016 18:10:53 +0000 (19:10 +0100)

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