Merge branch 'master' into master

This commit is contained in:
Ben Chatelain 2018-01-26 21:10:43 -07:00 committed by GitHub
commit ae27557b80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,6 @@
language: objective-c language: objective-c
xcode_sdk: macosx10.12 xcode_sdk: macosx10.12
osx_image: xcode8.3 osx_image: xcode9.2
env: env:
global: global: