Merge branch 'develop' into _corespotlight-test

Conflicts:
	CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
This commit is contained in:
John Estropia committed 2016-01-29 15:53:01 +09:00
commit 7565bfae2b
6 files changed
+77 -26

No files matched your search

@@ -167,6 +167,18 @@ internal extension NSManagedObjectContext {
}
}
internal func refreshAllObjectsAsFaults() {
if #available(iOS 8.3, *) {
self.refreshAllObjects()
}
else {
self.registeredObjects.forEach { self.refreshObject($0, mergeChanges: false) }
}
}
// MARK: Private