diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:47 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:47 -0400 |
| commit | 7e85254903c7c0cb49e381f16b18441ea7b058cc (patch) | |
| tree | b22328fcf4c8408fc25a7acb73d1cb1089cd82ac /resources | |
| parent | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (diff) | |
| parent | 1a365e77dfb8825136626202b1df462731b42060 (diff) | |
Merge commit '1a365e'
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/Resources.php | 2 | ||||
| -rw-r--r-- | resources/assets/file-type-icons/fileicon-djvu.xcf | bin | 0 -> 83394 bytes | |||
| -rw-r--r-- | resources/assets/file-type-icons/fileicon-ogg.xcf | bin | 0 -> 40236 bytes |
3 files changed, 2 insertions, 0 deletions
diff --git a/resources/Resources.php b/resources/Resources.php index 2c0ca9d9..feda8a53 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1202,6 +1202,7 @@ return array( 'jquery.textSelection', 'mediawiki.jqueryMsg', 'mediawiki.confirmCloseWindow', + 'user.options', ), 'messages' => array( 'editwarning-warning', @@ -1483,6 +1484,7 @@ return array( 'mediawiki.Title', 'mediawiki.util', 'mediawiki.confirmCloseWindow', + 'user.options', ), ), 'mediawiki.special.userlogin.common.styles' => array( diff --git a/resources/assets/file-type-icons/fileicon-djvu.xcf b/resources/assets/file-type-icons/fileicon-djvu.xcf Binary files differnew file mode 100644 index 00000000..8043dcdb --- /dev/null +++ b/resources/assets/file-type-icons/fileicon-djvu.xcf diff --git a/resources/assets/file-type-icons/fileicon-ogg.xcf b/resources/assets/file-type-icons/fileicon-ogg.xcf Binary files differnew file mode 100644 index 00000000..a91024bf --- /dev/null +++ b/resources/assets/file-type-icons/fileicon-ogg.xcf |