Merge branch 'release/0.7.1'

fillup · Nov 25, 2014 · 8a62610 · 8a62610
2 parents c5047d9 + f9144f9
commit 8a62610
Show file tree

Hide file tree

Showing 7 changed files with 351 additions and 265 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ vendor/
 *.local.php
 build/
 .vagrant/
+.idea/
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
-        "apigen/apigen": "dev-master",
+        "apigen/apigen": "2.*",
         "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ vendor/ @@
     *.local.php
     build/
     .vagrant/
+    .idea/