Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 51 deletions

diff --git a/vendor/leafo/lessphp/tests/outputs/import.css b/vendor/leafo/lessphp/tests/outputs/import.css
deleted file mode 100644
index b76c25b5..00000000
--- a/vendor/leafo/lessphp/tests/outputs/import.css
+++ /dev/null
@@ -1,51 +0,0 @@
-@import "not-found";
-@import "something.css" media;
-@import url("something.css") media;
-@import url(something.css) media, screen, print;
-b {
-  color: maroon;
-  padding: 16px;
-}
-body {
-  line-height: 10em;
-}
-body div.bright {
-  color: red;
-}
-body div.sad {
-  color: blue;
-}
-.one {
-  color: blue;
-}
-#merge-import-mixins .just-a-class {
-  background: red;
-}
-#merge-import-mixins .just-a-class {
-  background: blue;
-}
-#merge-import-mixins .hello {
-  height: 200px;
-}
-@media cool {
-  #merge-import-mixins {
-    color: red;
-    height: 200px;
-  }
-}
-#merge-import-mixins div {
-  background: red;
-  background: blue;
-}
-.inner {
-  content: "inner/file1.less";
-}
-.inner {
-  content: "inner/file2.less";
-}
-pre {
-  color: hello-from-file-3;
-}
-h2 {
-  background: url("../images/logo.png") no-repeat;
-}