Merge branch 'master' into migration/datastack

Conflicts: Kipu.podspec
3lvis · Feb 9, 2015 · e606442 · e606442
2 parents 4a08d11 + 6b0a8e5
commit e606442
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Kipu.podspec b/Kipu.podspec
@@ -25,5 +25,6 @@ s.frameworks = 'Foundation', 'CoreData'
 s.dependency 'DATAStack'
 s.dependency 'NSManagedObject-HYPPropertyMapper'
 s.dependency 'NSManagedObject-ANDYMapChanges'
+s.dependency 'DATAStack'
 s.dependency 'NSDictionary-ANDYSafeValue'
 end