Merge branch '2.1' into 2.2

orchestral · Jul 12, 2014 · a5c996b · a5c996b
2 parents 8d61d27 + 6c1b206
commit a5c996b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-Orchestra Platform 2 Avatar Component
+Avatar Package for Laravel and PHP
 ==============
 
-Avatar Component provide support for driver based avatar provider for your Laravel or Orchestra Platform 2 application.
+Avatar Package provide support for driver based avatar provider for your Laravel, PHP or Orchestra Platform 2 application.
 
 [![Latest Stable Version](https://poser.pugx.org/orchestra/avatar/v/stable.png)](https://packagist.org/packages/orchestra/avatar) 
 [![Total Downloads](https://poser.pugx.org/orchestra/avatar/downloads.png)](https://packagist.org/packages/orchestra/avatar) 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "orchestra/avatar",
-	"description": "Orchestra Platform 2 Avatar Component",
+	"description": "Avatar Package for Laravel and PHP",
 	"license": "MIT",
 	"keywords": ["orchestra-platform", "orchestral", "laravel", "avatar", "gravatar"],
 	"authors": [