joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.0

Browse source 
Conflicts:
	composer.json
This commit is contained in:
Josh Sherman 2014-10-16 10:40:52 -04:00
commit 59af055f7e
18 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
composer.json
View file

@ -1,5 +1,5 @@
{
"name": "picklesphp/pickles",
"name": "joshtronic/pickles",
"description": "Pickles is a PHP framework for building kick-ass services",
"type": "library",
"keywords": ["framework", "api", "soa", "oauth"],
@ -13,8 +13,8 @@
}
],
"support": {
"issues": "https://github.com/picklesphp/pickles/issues",
"source": "https://github.com/picklesphp/pickles"
"issues": "https://github.com/joshtronic/pickles/issues",
"source": "https://github.com/joshtronic/pickles"
},
"minimum-stability" : "dev",
"require-dev": {