Merge branch 'develop' into corestore4_develop

Browse Source

# Conflicts:
#	CoreStore.podspec
#	Sources/CoreStoreImportableAttributeType.swift
#	Sources/CoreStoreQueryableAttributeType.swift
#	Sources/Info.plist
#	Sources/NSManagedObjectModel+Setup.swift

...

This commit is contained in:

John Estropia committed 2017-05-10 19:11:01 +09:00

2 parents 8ff163af30 42c28b064a

commit e0abb9b0af

143 files changed

+20 -24

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

No files matched your search

Sources/CoreStore+CustomDebugStringConvertible.swift

+1414

File diff suppressed because it is too large. Load diff