Skip to content

Commit 4fc71f7

Browse files
committed
Merge remote-tracking branch 'upstream/master' into feature/reactive-uipickerview-adapter
2 parents 22c7d58 + a25ce1f commit 4fc71f7

File tree

161 files changed

+6592
-5018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+6592
-5018
lines changed

Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PODS:
2-
- RxCocoa (3.4.0):
3-
- RxSwift (~> 3.4)
4-
- RxSwift (3.4.0)
2+
- RxCocoa (3.6.1):
3+
- RxSwift (~> 3.6)
4+
- RxSwift (3.6.1)
55

66
DEPENDENCIES:
77
- RxCocoa (from `[email protected]:ReactiveX/RxSwift.git`, branch `master`)
@@ -17,16 +17,16 @@ EXTERNAL SOURCES:
1717

1818
CHECKOUT OPTIONS:
1919
RxCocoa:
20-
:commit: 1048219ea8ed777ee7b2655888caae6f61268f7c
20+
:commit: 80de9622b9bd1dca409b0e66e3ccc418676e571e
2121
:git: [email protected]:ReactiveX/RxSwift.git
2222
RxSwift:
23-
:commit: 1048219ea8ed777ee7b2655888caae6f61268f7c
23+
:commit: 80de9622b9bd1dca409b0e66e3ccc418676e571e
2424
:git: [email protected]:ReactiveX/RxSwift.git
2525

2626
SPEC CHECKSUMS:
27-
RxCocoa: 340254e41293a97d2be220592ea7d1e73980b1d5
28-
RxSwift: c744f5eb1c13a8acce49bb40fda553da7bf31046
27+
RxCocoa: 74590292782270293bec4f6be0edb72b3310030d
28+
RxSwift: 54c92b0ae783a364051f62a21d31ff972c5e41c4
2929

3030
PODFILE CHECKSUM: 29bf31f6a813ce527b77481cfb115102d889c025
3131

32-
COCOAPODS: 1.2.0
32+
COCOAPODS: 1.2.1

Pods/Local Podspecs/RxCocoa.podspec.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Local Podspecs/RxSwift.podspec.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Manifest.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 1285 additions & 1279 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/RxCocoa/Platform/RecursiveLock.swift

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/RxCocoa/README.md

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/RxCocoa/RxCocoa/Foundation/NSObject+Rx+KVORepresentable.swift

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/RxCocoa/RxCocoa/Foundation/NSObject+Rx+RawRepresentable.swift

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/RxCocoa/RxCocoa/Foundation/NSObject+Rx.swift

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)