mirror of
https://github.com/zhigang1992/RestKit.git
synced 2026-04-01 22:42:51 +08:00
Conflicts: Code/CoreData/RKManagedObjectLoader.h Code/CoreData/RKManagedObjectLoader.m Code/CoreData/RKManagedObjectMapping.m Code/CoreData/RKManagedObjectMappingOperation.m Code/CoreData/RKManagedObjectStore.m Code/CoreData/RKManagedObjectThreadSafeInvocation.h Code/CoreData/RKManagedObjectThreadSafeInvocation.m Code/CoreData/RKSearchableManagedObject.m Code/ObjectMapping/RKObjectLoader.m Code/ObjectMapping/RKObjectMapper.h Code/ObjectMapping/RKObjectMappingOperation.m RestKit.xcodeproj/project.pbxproj Tests/Logic/CoreData/RKManagedObjectThreadSafeInvocationTest.m