Merge branch 'master' into corestore2_develop

# Conflicts:
#	CoreStore.podspec
#	Sources/Info.plist
#	Sources/Transactions/UnsafeDataTransaction.swift
This commit is contained in:
John Rommel Estropia
2016-05-25 21:41:44 +09:00
4 changed files with 28 additions and 4 deletions

View File

@@ -729,7 +729,7 @@ or multiple objects at once with the `importUniqueObjects(...)` method:
```swift
CoreStore.beginAsynchronous { (transaction) -> Void in
let jsonArray: [[String: AnyObject]] = // ...
try! transaction.importObjects(
try! transaction.importUniqueObjects(
Into(MyPersonEntity),
sourceArray: jsonArray
)