III-2082 Update dependency and merge branch 'master' into feature/III…

…-2082 * master: III-1789 Upgrade to cultuurnet/calendar-summary version 1.1.1 # Conflicts: # composer.lock
cultuurnet · May 3, 2017 · 8a237b7 · 8a237b7
2 parents d3b550c + cd64ac9
commit 8a237b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "cultuurnet/deserializer": "~0.1",
         "cultuurnet/geocoding": "~0.1",
         "cultuurnet/silex-amqp": "~0.1",
-        "cultuurnet/udb3": "dev-feature/III-2082 as 0.1",
+        "cultuurnet/udb3": "~0.1",
         "cultuurnet/cdb": "~2.2",
         "cultuurnet/udb2-domain-events": "~0.1",
         "crell/api-problem": "^1.7",

diff --git a/composer.lock b/composer.lock