Merge branch 'develop'

mikaoj · Jun 12, 2015 · 8d4e35d · 8d4e35d
2 parents 8d47959 + 6870623
commit 8d4e35d
Show file tree

Hide file tree

Showing 22 changed files with 1,939 additions and 1,365 deletions.
diff --git a/BSImagePicker.podspec b/BSImagePicker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "BSImagePicker"
-  s.version          = "1.0"
+  s.version          = "1.0.1"
   s.summary          = "BSImagePicker is a multiple image picker for iOS 8."
   s.description      = <<-DESC
   A mix between the native iOS 8 gallery and facebooks image picker. Allows you to preview and select multiple images.

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - BSImagePicker (1.0):
-    - UIImageViewModeScaleAspect (= 1.3)
+    - UIImageViewModeScaleAspect (~> 1.3)
   - FBSnapshotTestCase (1.8.1)
   - UIImageViewModeScaleAspect (1.3)
 
@@ -13,8 +13,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  BSImagePicker: 5115b62f4595f731fa92c47a94911186f9bda2ad
+  BSImagePicker: 4c5c5c07186ea635ddd65ddc4e6abff3276d6c1b
   FBSnapshotTestCase: 3dc3899168747a0319c5278f5b3445c13a6532dd
   UIImageViewModeScaleAspect: ec78901acfc20d3782154111a21d34390f8f71ad
 
-COCOAPODS: 0.37.1
+COCOAPODS: 0.37.2
diff --git a/Example/Pods/Local Podspecs/BSImagePicker.podspec.json b/Example/Pods/Local Podspecs/BSImagePicker.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...roj/xcshareddata/xcschemes/Pods-BSImagePickerExample-BSImagePicker-BSImagePicker.xcscheme b/...roj/xcshareddata/xcschemes/Pods-BSImagePickerExample-BSImagePicker-BSImagePicker.xcscheme
diff --git a/...ds/Pods.xcodeproj/xcshareddata/xcschemes/Pods-BSImagePickerExample-BSImagePicker.xcscheme b/...ds/Pods.xcodeproj/xcshareddata/xcschemes/Pods-BSImagePickerExample-BSImagePicker.xcscheme
diff --git a/...cshareddata/xcschemes/Pods-BSImagePickerExampleTests-BSImagePicker-BSImagePicker.xcscheme b/...cshareddata/xcschemes/Pods-BSImagePickerExampleTests-BSImagePicker-BSImagePicker.xcscheme
diff --git a/...ds.xcodeproj/xcshareddata/xcschemes/Pods-BSImagePickerExampleTests-BSImagePicker.xcscheme b/...ds.xcodeproj/xcshareddata/xcschemes/Pods-BSImagePickerExampleTests-BSImagePicker.xcscheme
diff --git a/...eddata/xcschemes/Pods-BSImagePickerObjectiveCExample-BSImagePicker-BSImagePicker.xcscheme b/...eddata/xcschemes/Pods-BSImagePickerObjectiveCExample-BSImagePicker-BSImagePicker.xcscheme