Merge remote-tracking branch 'upstream/master'

# Conflicts: # .ez.yml
ezecosystem · Jun 7, 2017 · 2384847 · 2384847
2 parents fc76268 + f905760
commit 2384847
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/.ez.yml b/.ez.yml
@@ -1,14 +1,8 @@
 v: 0
 
-# This is a bundle, so we need to specify info for meta repo
-meta:
-  repo: "git@github.com:ezsystems/ezplatform-ee-demo.git"
-  branch: "master"
-  self_alias: "1.10.x-dev"
-
 # ci
 integrate:
   command: "bin/behat"
   matrix:
-  # Run 'common' tagged behat scenarios on ezplatform-ee install
+  # Run 'common' tagged behat scenarios on ezplatform-ee-demo install
     - {arguments: "-v --profile demoMeta --tags common --strict", install: "demo"}