dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5de89d8 644d135)
Merge "Better handle already-used rev_id when restoring"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 12 Aug 2016 19:25:07 +0000 (19:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 12 Aug 2016 19:25:07 +0000 (19:25 +0000)
1  2 
languages/i18n/en.json patch | diff1 | diff2 | blob | history
languages/i18n/qqq.json patch | diff1 | diff2 | blob | history

diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
Wiklou, le Wiki du Wiklou