Merge branch 'release/0.21'

cross-solution · Sep 17, 2015 · dc64d84 · dc64d84
2 parents 791bcbb + b5ba11b
commit dc64d84
Show file tree

Hide file tree

Showing 766 changed files with 7,482 additions and 6,642 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ services:
   - mongodb
 
 env:
-  - PECLMONGO=mongo-1.5.8
+  - PECLMONGO=mongo-1.6.10
 
 before_install:
   - sudo apt-get update > /dev/null

diff --git a/build.xml b/build.xml
diff --git a/composer.json b/composer.json
@@ -45,7 +45,8 @@
         "ivaynberg/select2": "3.5.*",
         "tinymce/tinymce": "*",
         "mikemix/zf2htmlpurifier": "*",
-        "cross-solution/bootstrap3-dialog": "dev-master"
+        "cross-solution/bootstrap3-dialog": "dev-master",
+        "components/flag-icon-css": "^0.7.1"
     },
     "require-dev": {
         "phpunit/phpunit": "4.7.*",