Merge commit 'fa89acd'

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

3 files changed, 0 insertions, 292 deletions

diff --git a/vendor/leafo/lessphp/tests/inputs_lessjs/mixins-args.less b/vendor/leafo/lessphp/tests/inputs_lessjs/mixins-args.less
deleted file mode 100644
index c3965924..00000000
--- a/vendor/leafo/lessphp/tests/inputs_lessjs/mixins-args.less
+++ /dev/null
@@ -1,205 +0,0 @@
-.mixin (@a: 1px, @b: 50%) {
-  width: (@a * 5);
-  height: (@b - 1%);
-}
-
-.mixina (@style, @width, @color: black) {
-    border: @width @style @color;
-}
-
-.mixiny
-(@a: 0, @b: 0) {
-  margin: @a;
-  padding: @b;
-}
-
-.hidden() {
-  color: transparent; // asd
-}
-
-#hidden {
-  .hidden;
-}
-
-#hidden1 {
-  .hidden();
-}
-
-.two-args {
-  color: blue;
-  .mixin(2px, 100%);
-  .mixina(dotted, 2px);
-}
-
-.one-arg {
-  .mixin(3px);
-}
-
-.no-parens {
-  .mixin;
-}
-
-.no-args {
-  .mixin();
-}
-
-.var-args {
-  @var: 9;
-  .mixin(@var, (@var * 2));
-}
-
-.multi-mix {
-  .mixin(2px, 30%);
-  .mixiny(4, 5);
-}
-
-.maxa(@arg1: 10, @arg2: #f00) {
-  padding: (@arg1 * 2px);
-  color: @arg2;
-}
-
-body {
-  .maxa(15);
-}
-
-@glob: 5;
-.global-mixin(@a:2) {
-  width: (@glob + @a);
-}
-
-.scope-mix {
-  .global-mixin(3);
-}
-
-.nested-ruleset (@width: 200px) {
-    width: @width;
-    .column { margin: @width; }
-}
-.content {
-    .nested-ruleset(600px);
-}
-
-//
-
-.same-var-name2(@radius) {
-  radius: @radius;
-}
-.same-var-name(@radius) {
-  .same-var-name2(@radius);
-}
-#same-var-name {
-  .same-var-name(5px);
-}
-
-//
-
-.var-inside () {
-    @var: 10px;
-    width: @var;
-}
-#var-inside { .var-inside; }
-
-.mixin-arguments (@width: 0px, ...) {
-    border: @arguments;
-    width: @width;
-}
-
-.arguments {
-    .mixin-arguments(1px, solid, black);
-}
-.arguments2 {
-    .mixin-arguments();
-}
-.arguments3 {
-    .mixin-arguments;
-}
-
-.mixin-arguments2 (@width, @rest...) {
-    border: @arguments;
-    rest: @rest;
-    width: @width;
-}
-.arguments4 {
-    .mixin-arguments2(0, 1, 2, 3, 4);
-}
-
-// Edge cases
-
-.edge-case {
-    .mixin-arguments("{");
-}
-
-// Division vs. Literal Slash
-.border-radius(@r: 2px/5px) {
-  border-radius: @r;
-}
-.slash-vs-math {
-  .border-radius();
-  .border-radius(5px/10px);
-  .border-radius((3px * 2));
-}
-// semi-colon vs comma for delimiting
-
-.mixin-takes-one(@a) {
-    one: @a;
-}
-
-.mixin-takes-two(@a; @b) {
-    one: @a;
-    two: @b;
-}
-
-.comma-vs-semi-colon {
-    .mixin-takes-two(@a : a; @b : b, c);
-    .mixin-takes-two(@a : d, e; @b : f);
-    .mixin-takes-one(@a: g);
-    .mixin-takes-one(@a : h;);
-    .mixin-takes-one(i);
-    .mixin-takes-one(j;);
-    .mixin-takes-two(k, l);
-    .mixin-takes-one(m, n;);
-    .mixin-takes-two(o, p; q);
-    .mixin-takes-two(r, s; t;);
-}
-
-.mixin-conflict(@a:defA, @b:defB, @c:defC) {
-  three: @a, @b, @c;
-}
-
-.mixin-conflict(@a:defA, @b:defB, @c:defC, @d:defD) {
-  four: @a, @b, @c, @d;
-}
-
-#named-conflict {
-  .mixin-conflict(11, 12, 13, @a:a);
-  .mixin-conflict(@a:a, 21, 22, 23);
-}
-@a: 3px;
-.mixin-default-arg(@a: 1px, @b: @a, @c: @b) {
-  defaults: 1px 1px 1px;
-  defaults: 2px 2px 2px;
-}
-
-.test-mixin-default-arg {
-  .mixin-default-arg();
-  .mixin-default-arg(2px);
-}
-
-.mixin-comma-default1(@color; @padding; @margin: 2, 2, 2, 2) {
-  margin: @margin;
-}
-.selector {
-  .mixin-comma-default1(#33acfe; 4);
-}
-.mixin-comma-default2(@margin: 2, 2, 2, 2;) {
-  margin: @margin;
-}
-.selector2 {
-  .mixin-comma-default2();
-}
-.mixin-comma-default3(@margin: 2, 2, 2, 2) {
-  margin: @margin;
-}
-.selector3 {
-  .mixin-comma-default3(4,2,2,2);
-}
diff --git a/vendor/leafo/lessphp/tests/inputs_lessjs/mixins-named-args.less b/vendor/leafo/lessphp/tests/inputs_lessjs/mixins-named-args.less
deleted file mode 100644
index f62dc86a..00000000
--- a/vendor/leafo/lessphp/tests/inputs_lessjs/mixins-named-args.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.mixin (@a: 1px, @b: 50%) {
-  width: (@a * 5);
-  height: (@b - 1%);
-  args: @arguments;
-}
-.mixin (@a: 1px, @b: 50%) when (@b > 75%){
-  text-align: center;
-}
-
-.named-arg {
-  color: blue;
-  .mixin(@b: 100%);
-}
-
-.class {
-  @var: 20%;
-  .mixin(@b: @var);
-}
-
-.all-args-wrong-args {
-  .mixin(@b: 10%, @a: 2px);
-}
-
-.mixin2 (@a: 1px, @b: 50%, @c: 50) {
-  width: (@a * 5);
-  height: (@b - 1%);
-  color: (#000000 + @c);
-}
-
-.named-args2 {
-  .mixin2(3px, @c: 100);
-}
-
-.named-args3 {
-  .mixin2(@b: 30%, @c: #123456);
-}
diff --git a/vendor/leafo/lessphp/tests/inputs_lessjs/strings.less b/vendor/leafo/lessphp/tests/inputs_lessjs/strings.less
deleted file mode 100644
index 32fad721..00000000
--- a/vendor/leafo/lessphp/tests/inputs_lessjs/strings.less
+++ /dev/null
@@ -1,51 +0,0 @@
-#strings {
-  background-image: url("http://son-of-a-banana.com");
-  quotes: "~" "~";
-  content: "#*%:&^,)!.(~*})";
-  empty: "";
-  brackets: "{" "}";
-  escapes: "\"hello\" \\world";
-  escapes2: "\"llo";
-}
-#comments {
-  content: "/* hello */ // not-so-secret";
-}
-#single-quote {
-  quotes: "'" "'";
-  content: '""#!&""';
-  empty: '';
-  semi-colon: ';';
-}
-#escaped {
-  filter: ~"DX.Transform.MS.BS.filter(opacity=50)";
-}
-#one-line { image: url(http://tooks.com) }
-#crazy { image: url(http://), "}", url("http://}") }
-#interpolation {
-  @var: '/dev';
-  url: "http://lesscss.org@{var}/image.jpg";
-
-  @var2: 256;
-  url2: "http://lesscss.org/image-@{var2}.jpg";
-
-  @var3: #456;
-  url3: "http://lesscss.org@{var3}";
-
-  @var4: hello;
-  url4: "http://lesscss.org/@{var4}";
-
-  @var5: 54.4px;
-  url5: "http://lesscss.org/@{var5}";
-}
-
-// multiple calls with string interpolation
-
-.mix-mul (@a: green) {
-    color: ~"@{a}";
-}
-.mix-mul-class {
-    .mix-mul(blue);
-    .mix-mul(red);
-    .mix-mul(black);
-    .mix-mul(orange);
-}