Merge branch 'master' into drop-samples.json

Conflicts:
	.travis.yml
This commit is contained in:
Arfon Smith
2014-09-18 14:29:54 -05:00

View File

@@ -2,7 +2,6 @@ before_install:
- git fetch origin master:master
- git fetch origin v2.0.0:v2.0.0
- sudo apt-get install libicu-dev -y
- gem update --system 2.1.11
rvm:
- 1.9.3
- 2.0.0