Merge branch 'master' into 2.0

This commit is contained in:
Josh Sherman 2014-10-07 09:31:21 -04:00
commit 442e505cbf
2 changed files with 8 additions and 9 deletions

View file

@ -22,6 +22,7 @@ services:
- redis - redis
install: install:
- composer self-update
- composer install - composer install
before_script: before_script:

View file

@ -1,9 +1,9 @@
# Pickles # Pickles
[![Build Status](https://travis-ci.org/picklesphp/pickles.png?branch=master)](https://travis-ci.org/picklesphp/pickles) [![License](http://img.shields.io/packagist/l/picklesphp/pickles.svg?style=flat)][packagist]
[![Coverage Status](https://coveralls.io/repos/picklesphp/pickles/badge.png)](https://coveralls.io/r/picklesphp/pickles) [![Build](http://img.shields.io/travis/picklesphp/pickles.svg?style=flat)][travis]
[![Dependency Status](https://www.versioneye.com/user/projects/52d1bc1eec13751bde00002a/badge.png)](https://www.versioneye.com/user/projects/52d1bc1eec13751bde00002a) [![Coverage](http://img.shields.io/coveralls/picklesphp/pickles.svg?style=flat)][coveralls]
[![Stories in Ready](https://badge.waffle.io/picklesphp/pickles.png?label=ready&title=Ready)](https://waffle.io/picklesphp/pickles) [![Downloads](http://img.shields.io/packagist/dt/picklesphp/pickles.svg?style=flat)][packagist]
Pickles f/k/a PICKLES (PHP Interface Collection of Killer Libraries to Enhance Pickles f/k/a PICKLES (PHP Interface Collection of Killer Libraries to Enhance
Stuff) is an open source framework for the rapid development of RESTful Stuff) is an open source framework for the rapid development of RESTful
@ -20,11 +20,9 @@ contributor, [Justin Davis][JustinDavis] for romanticizing the v2 reimagining
and [Dean Jones][DeanJones] for helping to come up with the original PICKLES v1 and [Dean Jones][DeanJones] for helping to come up with the original PICKLES v1
acronym. acronym.
[coveralls]: https://coveralls.io/r/picklesphp/pickles
[packagist]: https://packagist.org/packages/picklesphp/pickles
[travis]: http://travis-ci.org/picklesphp/pickles
[DeanJones]: https://github.com/deanproxy [DeanJones]: https://github.com/deanproxy
[GeoffOliver]: https://github.com/geoffoliver [GeoffOliver]: https://github.com/geoffoliver
[JustinDavis]: http://justindavis.co [JustinDavis]: http://justindavis.co
[HolidayAPI]: https://github.com/gravityblvd/tools.gravityblvd.com
[MasterZip]: https://github.com/picklesphp/pickles/archive/master.zip
[StackPost]: http://joshtronic.com/2014/01/13/your-stack-is-outdated/#.UuVzI3n0A18
[v13.12]: https://github.com/picklesphp/pickles/tree/13.12