Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2016-01-17 09:35:23 -06:00
commit feb721fa3d

View File

@ -1,7 +1,6 @@
language: php
php:
- 5.3.3
- 5.3
- 5.4
- 5.5.9