Merge branch 'develop' into corestore2_develop

# Conflicts:
#	CoreStore.podspec
#	CoreStore/CartFile
#	README.md
#	Sources/Info.plist
#	Sources/Internal/NSManagedObjectModel+Setup.swift
#	Sources/Logging/CoreStore+Logging.swift
This commit is contained in:
John Rommel Estropia committed 2016-03-23 21:23:08 +09:00
commit dd6c6abaf0
5 files changed
+5 -4

No files matched your search

+1 -1
View File
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
s.dependency "GCDKit", "1.2.0"
s.dependency "GCDKit", "1.2.1"
end