Merge commit '80f7dc'

# Conflicts:
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 22 deletions

diff --git a/vendor/ruflin/elastica/lib/Elastica/Filter/BoolOr.php b/vendor/ruflin/elastica/lib/Elastica/Filter/BoolOr.php
deleted file mode 100644
index 6f63fc30..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Filter/BoolOr.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Elastica\Filter;
-
-/**
- * Or Filter
- *
- * @category Xodoa
- * @package Elastica
- * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/or-filter.html
- */
-class BoolOr extends AbstractMulti
-{
-    /**
-     * @return string
-     */
-    protected function _getBaseName()
-    {
-        return 'or';
-    }
-}