John Estropia
|
12dc32f7e6
|
Merge branch 'develop' into datasources
# Conflicts:
# CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
# CoreStoreTests/DynamicModelTests.swift
# Sources/BaseDataTransaction+Importing.swift
# Sources/CoreStoreObject.swift
# Sources/CustomSchemaMappingProvider.swift
# Sources/DynamicObject.swift
# Sources/Functions.swift
# Sources/ImportableUniqueObject.swift
# Sources/NSManagedObjectContext+Querying.swift
|
2019-08-29 17:15:45 +09:00 |
|