Merge branch 'develop' into datasources

Browse Source

# 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

...

This commit is contained in:

John Estropia

2019-08-29 17:15:45 +09:00

parent 79655ffde5 b4c38caf1e

commit 12dc32f7e6

97 changed files with 2224 additions and 1721 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

.swiftpm/xcode/package.xcworkspace/xcuserdata/JohnEstropia.xcuserdatad/UserInterfaceState.xcuserstate generated Normal file

Binary file not shown.