dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a66d17a ebb1680)
Merge "Show dimensions in TraditionalImageGallery"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 15 Jun 2017 17:16:13 +0000 (17:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 15 Jun 2017 17:16:13 +0000 (17:16 +0000)
1  2 
includes/DefaultSettings.php patch | diff1 | diff2 | blob | history
includes/parser/Parser.php patch | diff1 | diff2 | blob | history

diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/parser/Parser.php
Simple merge
Wiklou, le Wiki du Wiklou