RxSwift/Documentation
Jamie Pinkham 0e38ecbc87 Merge branch 'develop' into swift-3.0
# Conflicts:
#	Documentation/DesignRationale.md
#	Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift
#	RxCocoa/Common/DelegateProxyType.swift
#	RxCocoa/iOS/UICollectionView+Rx.swift
#	RxCocoa/iOS/UIControl+Rx.swift
#	RxCocoa/iOS/UIScrollView+Rx.swift
#	RxCocoa/iOS/UITableView+Rx.swift
#	RxExample/RxDataSources/DataSources+Rx/ObservableConvertibleType+Differentiator.swift
#	RxSwift/Concurrency/Lock.swift
#	RxSwift/Disposables/CompositeDisposable.swift
#	RxSwift/Event.swift
#	RxSwift/Extensions/String+Rx.swift
#	RxSwift/Schedulers/OperationQueueScheduler.swift
2016-06-17 21:14:06 -07:00
..
API.md Merge branch 'develop' into swift-3.0 2016-06-17 21:14:06 -07:00
ComparisonWithOtherLibraries.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
DesignRationale.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
ExampleApp.md Updates documentation. 2016-02-14 15:10:14 +01:00
Examples.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
GettingStarted.md Merge branch 'develop' into swift-3.0 2016-06-17 21:14:06 -07:00
HotAndColdObservables.md Documentation fixes. 2015-07-31 11:43:31 +02:00
Installation.md Updates documentation. 2016-02-14 15:10:14 +01:00
IssueTemplate.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
Linux.md Merge branch 'develop' into swift-3.0 2016-06-17 21:14:06 -07:00
MathBehindRx.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
Migration.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
NewFeatureRequestTemplate.md Updates documentation. 2016-02-14 15:10:14 +01:00
Playgrounds.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
Schedulers.md Use new associatedtype syntax 2016-03-22 11:09:16 +01:00
Subjects.md Documentation 2015-07-31 11:43:31 +02:00
Tips.md Small fix for Tips.md 2016-04-05 21:53:11 +02:00
UnitTests.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
Units.md Fix typo in Documentation/Units.md 2016-05-26 04:17:52 +09:00
Warnings.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00
Why.md Fix typos and tweak language in docs 2016-05-12 13:42:29 +02:00