Merge pull request #105 from niden/master

Changed the Phalcon version to 1.2.5 in composer.json
phalcon · Jan 15, 2014 · af1d30c · af1d30c
2 parents 3e5e723 + 634d6ef
commit af1d30c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.3.6",
-        "ext-phalcon": "1.2.4"
+        "ext-phalcon": "1.2.5"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.28",