Merge commit '80f7dc'

# Conflicts:
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 22 deletions

diff --git a/vendor/ruflin/elastica/lib/Elastica/Query/MatchAll.php b/vendor/ruflin/elastica/lib/Elastica/Query/MatchAll.php
deleted file mode 100644
index 23b4fdfc..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Query/MatchAll.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Elastica\Query;
-
-/**
- * Match all query. Returns all results
- *
- * @category Xodoa
- * @package Elastica
- * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/match-all-query.html
- */
-class MatchAll extends AbstractQuery
-{
-    /**
-     * Creates match all query
-     */
-    public function __construct()
-    {
-        $this->_params = new \stdClass();
-    }
-}