dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa6f866 bd7ebde)
Merge "Add option to chose what language to fetch file description in."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 25 Sep 2013 15:51:13 +0000 (15:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 25 Sep 2013 15:51:13 +0000 (15:51 +0000)
1  2 
includes/filerepo/file/File.php patch | diff1 | diff2 | blob | history
includes/filerepo/file/LocalFile.php patch | diff1 | diff2 | blob | history

diff --cc includes/filerepo/file/File.php
Simple merge
diff --cc includes/filerepo/file/LocalFile.php
Simple merge
Wiklou, le Wiki du Wiklou