dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 749dd06 3dcf8c5)
Merge "(Bug 41352) Provide tests for edit conflicts."
authorHashar <hashar@free.fr>
Sat, 10 Nov 2012 16:44:44 +0000 (16:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 10 Nov 2012 16:44:44 +0000 (16:44 +0000)

Trivial merge
Wiklou, le Wiki du Wiklou