dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1b49af 073c4bf)
Merge "Add CASCADINGSOURCES parser function"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 6 Jan 2014 19:04:53 +0000 (19:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 6 Jan 2014 19:04:53 +0000 (19:04 +0000)
1  2 
includes/parser/Parser.php patch | diff1 | diff2 | blob | history
languages/messages/MessagesEn.php patch | diff1 | diff2 | blob | history

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