Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 0 insertions, 112 deletions

diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css
deleted file mode 100644
index aafdff36..00000000
--- a/resources/lib/oojs-ui/oojs-ui.svg.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/*!
- * OOjs UI v0.1.0-pre (f2c3f12959)
- * https://www.mediawiki.org/wiki/OOjs_UI
- *
- * Copyright 2011–2014 OOjs Team and other contributors.
- * Released under the MIT license
- * http://oojs.mit-license.org
- *
- * Date: 2014-09-18T23:22:20Z
- */
-/*
- * Blank theme mixins.
- *
- * Base styles invoke these mixins at the end of their definitions. Override these mixins to add
- * additional rules to the base styles.
- */
-.oo-ui-icon-add-item {
-	background-image: /* @embed */ url(images/icons/add-item.svg);
-}
-.oo-ui-icon-advanced {
-	background-image: /* @embed */ url(images/icons/advanced.svg);
-}
-.oo-ui-icon-alert {
-	background-image: /* @embed */ url(images/icons/alert.svg);
-}
-.oo-ui-icon-check {
-	background-image: /* @embed */ url(images/icons/check.svg);
-}
-.oo-ui-icon-clear {
-	background-image: /* @embed */ url(images/icons/clear.svg);
-}
-.oo-ui-icon-close {
-	background-image: /* @embed */ url(images/icons/close.svg);
-}
-.oo-ui-icon-code {
-	background-image: /* @embed */ url(images/icons/code.svg);
-}
-.oo-ui-icon-collapse {
-	background-image: /* @embed */ url(images/icons/collapse.svg);
-}
-.oo-ui-icon-comment {
-	background-image: /* @embed */ url(images/icons/comment.svg);
-}
-.oo-ui-icon-expand {
-	background-image: /* @embed */ url(images/icons/expand.svg);
-}
-.oo-ui-icon-help {
-	background-image: /* @embed */ url(images/icons/help.svg);
-}
-.oo-ui-icon-info {
-	background-image: /* @embed */ url(images/icons/info.svg);
-}
-.oo-ui-icon-link {
-	background-image: /* @embed */ url(images/icons/link.svg);
-}
-.oo-ui-icon-menu {
-	background-image: /* @embed */ url(images/icons/menu.svg);
-}
-.oo-ui-icon-next {
-	background-image: /* @embed */ url(images/icons/move-ltr.svg);
-}
-.oo-ui-icon-picture {
-	background-image: /* @embed */ url(images/icons/picture.svg);
-}
-.oo-ui-icon-previous {
-	background-image: /* @embed */ url(images/icons/move-rtl.svg);
-}
-.oo-ui-icon-redo {
-	background-image: /* @embed */ url(images/icons/arched-arrow-ltr.svg);
-}
-.oo-ui-icon-remove {
-	background-image: /* @embed */ url(images/icons/remove.svg);
-}
-.oo-ui-icon-search {
-	background-image: /* @embed */ url(images/icons/search.svg);
-}
-.oo-ui-icon-settings {
-	background-image: /* @embed */ url(images/icons/settings.svg);
-}
-.oo-ui-icon-tag {
-	background-image: /* @embed */ url(images/icons/tag.svg);
-}
-.oo-ui-icon-undo {
-	background-image: /* @embed */ url(images/icons/arched-arrow-rtl.svg);
-}
-.oo-ui-icon-window {
-	background-image: /* @embed */ url(images/icons/window.svg);
-}
-.oo-ui-indicator-alert {
-	background-image: /* @embed */ url(images/indicators/alert.svg);
-}
-.oo-ui-indicator-down {
-	background-image: /* @embed */ url(images/indicators/arrow-down.svg);
-}
-.oo-ui-indicator-next {
-	background-image: /* @embed */ url(images/indicators/arrow-ltr.svg);
-}
-.oo-ui-indicator-previous {
-	background-image: /* @embed */ url(images/indicators/arrow-rtl.svg);
-}
-.oo-ui-indicator-required {
-	background-image: /* @embed */ url(images/indicators/required.svg);
-}
-.oo-ui-indicator-up {
-	background-image: /* @embed */ url(images/indicators/arrow-up.svg);
-}
-.oo-ui-texture-pending {
-	background-image: /* @embed */ url(images/textures/pending.gif);
-}
-.oo-ui-texture-transparency {
-	background-image: /* @embed */ url(images/textures/transparency.svg);
-}