John Estropia e0abb9b0af Merge branch 'develop' into corestore4_develop ...

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

2017-05-10 19:11:01 +09:00

..

project.xcworkspace

Fixes #98 (deadlock when merge happens while main queue is querying)

2016-09-29 14:47:51 -04:00

xcshareddata/xcschemes

relationships done!

2017-04-06 20:28:17 +09:00

project.pbxproj

Merge branch 'develop' into corestore4_develop

2017-05-10 19:11:01 +09:00