Merge branch 'master' into develop
This commit is contained in:
commit
2fcb23eb7e
|
|
@ -3,8 +3,8 @@ platform :ios, '8.0'
|
||||||
use_frameworks!
|
use_frameworks!
|
||||||
|
|
||||||
target 'TGPControlsDemo-Pods' do
|
target 'TGPControlsDemo-Pods' do
|
||||||
#pod 'TGPControls', :path => '../../TGPControls'
|
pod 'TGPControls', :path => '../../TGPControls'
|
||||||
pod 'TGPControls'
|
#pod 'TGPControls'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue