Merge branch 'master' into develop

This commit is contained in:
Krunoslav Zaher 2016-01-17 13:36:55 +01:00
commit a8dd559ba2
2 changed files with 2 additions and 2 deletions

View File

@ -24,5 +24,5 @@ Waiting for observable sequence to complete before exiting command line applicat
s.source_files = 'RxBlocking/**/*.swift'
s.dependency 'RxSwift', '~> 2.0'
s.dependency 'RxSwift', '~> 2.1'
end

View File

@ -25,5 +25,5 @@ Pod::Spec.new do |s|
s.watchos.source_files = 'RxCocoa/iOS/**/*.swift'
s.tvos.source_files = 'RxCocoa/iOS/**/*.swift'
s.dependency 'RxSwift', '~> 2.0'
s.dependency 'RxSwift', '~> 2.1'
end