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 |
|