Merge branch 'master' into 2.0

Conflicts: readme.md src/config/formatter.php
Soapbox · Oct 20, 2014 · cc31318 · cc31318
2 parents 2fa5204 + 035ebef
commit cc31318
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/readme.md b/readme.md
@@ -21,9 +21,9 @@ Through composer.json:
 
 ```json
 {
-	"require": {
-		"soapbox/laravel-formatter": "2.x"
-	}
+  "require": {
+    "soapbox/laravel-formatter": "2.x"
+  }
 }
 
 ```
@@ -95,3 +95,4 @@ __PHP Export__
 ```php
 $export = var_export($formatter->toArray());
 ```
+