Skip to content

Commit

Permalink
Merge branch '2.0'
Browse files Browse the repository at this point in the history
Conflicts:
	composer.json

Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
crynobone committed Jun 8, 2013
2 parents dfd471d + f3d4fd7 commit 1de677a
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions composer.json
@@ -1,12 +1,14 @@
{
"name": "orchestra/widget",
"description": "Orchestra Platform Widget Component",
"keywords": ["orchestra-platform", "laravel"],
"homepage": "http://orchestraplatform.com/docs/2.0/components/widget/",
"keywords": ["orchestra-platform", "orchestral", "laravel"],
"license": "MIT",
"authors": [
{
"name": "Mior Muhammad Zaki",
"email": "crynobone@gmail.com"
"email": "crynobone@gmail.com",
"homepage": "https://github.com/crynobone"
}
],
"autoload": {
Expand All @@ -16,7 +18,7 @@
},
"require": {
"php": ">=5.3.3",
"orchestra/support": "2.1.*"
"orchestra/support": "self.version"
},
"require-dev": {
"mockery/mockery": "0.8.0",
Expand Down

0 comments on commit 1de677a

Please sign in to comment.