John Estropia
|
2e44f86eb6
|
Merge branch 'develop' into swift3_develop
# Conflicts:
# Cartfile
# Carthage/Checkouts/GCDKit
# CoreStore.podspec
# CoreStore.xcodeproj/project.pbxproj
# CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
# CoreStoreTests/BaseTests/BaseTestCase.swift
# CoreStoreTests/FromTests.swift
# CoreStoreTests/GroupByTests.swift
# CoreStoreTests/OrderByTests.swift
# CoreStoreTests/StorageInterfaceTests.swift
# CoreStoreTests/TweakTests.swift
# CoreStoreTests/WhereTests.swift
# README.md
# Sources/Internal/CoreStoreFetchRequest.swift
# Sources/Internal/NSManagedObjectContext+Querying.swift
# Sources/Internal/NSManagedObjectModel+Setup.swift
# Sources/Migrating/DataStack+Migration.swift
# Sources/ObjectiveC/CSSQliteStore.swift
# Sources/ObjectiveC/CSStorageInterface.swift
# Sources/ObjectiveC/CoreStoreBridge.swift
# Sources/Observing/ListMonitor.swift
# Sources/Setup/DataStack.swift
# Sources/Setup/StorageInterfaces/ICloudStore.swift
# Sources/Setup/StorageInterfaces/LegacySQLiteStore.swift
# Sources/Setup/StorageInterfaces/SQLiteStore.swift
# Sources/Setup/StorageInterfaces/StorageInterface.swift
|
2016-09-27 18:55:37 +09:00 |
|