Merge remote-tracking branch 'UrbanApps/master'

# Conflicts:
#	Source/Armchair.swift
This commit is contained in:
whitepixelstudios
2017-07-31 11:50:17 +10:00
parent 068c4b92c1
commit ea3ab5ed28
3 changed files with 19 additions and 6 deletions

View File

@@ -28,7 +28,5 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.requires_arc = true
end