sergdort cfb8b1558a Merge branch 'master' into swift-3.0 ... Conflicts: RxExample/RxDataSources/DataSources/CollectionViewSectionedDataSource.swift RxExample/RxDataSources/DataSources/Differentiator.swift RxExample/RxDataSources/DataSources/TableViewSectionedDataSource.swift RxExample/RxExample.xcodeproj/project.pbxproj RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOS-no-module.xcscheme RxExample/RxExample/Examples/TableViewPartialUpdates/PartialUpdatesViewController.swift RxExample/RxExample/Examples/TableViewWithEditingCommands/TableViewWithEditingCommandsViewController.swift RxExample/RxExample/Services/HtmlParsing.swift Tests/RxCocoaTests/CLLocationManager+RxTests.swift Tests/RxCocoaTests/UICollectionView+RxTests.swift		2016-07-05 18:00:36 +03:00
..
contents.xcworkspacedata	Merge branch 'master' into swift-3.0	2016-07-05 18:00:36 +03:00