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

2
src/Resource.php
View file

@ -8,7 +8,7 @@
*
* @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com
* @link https://github.com/joshtronic/pickles
* @package Pickles
*/