Merge bd9ed58 into e11c2f8

cultuurnet · May 22, 2017 · e6943b1 · e6943b1
2 parents e11c2f8 + bd9ed58
commit e6943b1
Show file tree

Hide file tree

Showing 5 changed files with 326 additions and 367 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
   ],
   "require": {
     "cultuurnet/hydra": "~0.1",
-    "cultuurnet/udb3-search": "~0.1",
+    "cultuurnet/udb3-search": "dev-feature/III-2117 as 0.1",
     "cultuurnet/geocoding": "~0.1",
     "cultuurnet/valueobjects": "~3.0",
     "symfony/http-foundation": "~2.7.2"
@@ -20,7 +20,8 @@
     "phpunit/phpunit": "~5.7",
     "squizlabs/php_codesniffer": "~2.3",
     "phing/phing": "~2.11",
-    "satooshi/php-coveralls": "~0.7"
+    "satooshi/php-coveralls": "~0.7",
+    "cultuurnet/udb3-search-elasticsearch": "dev-feature/III-2117 as 0.1"
   },
   "autoload": {
     "psr-4": {