Merge pull request #286 from longbai/travis

longbai · web-flow · commit 1dd5dbb3424b · 2018-08-16T14:26:32.000+08:00
7.2.5
diff --git a/.Podfile.swo b/.Podfile.swo
diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 *.xccoverage.plist
-
+QiniuSDK.xcworkspace/xcshareddata/
 # Subversion
 .svn
 
@@ -35,3 +35,4 @@ DerivedData
 #
 Pods/
 Podfile.lock
+.Podfile.swo
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 #Changelog
 
+## 7.2.5 (2018-08-16)
+## 修正
+* Form上传配置filename
+
 ## 7.2.4 (2018-05-11)
 ## 增加
 * 新上传节点
diff --git a/Qiniu.podspec b/Qiniu.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '7.2.4'
+  s.version      = '7.2.5'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'
diff --git a/QiniuSDK/Common/QNVersion.h b/QiniuSDK/Common/QNVersion.h
@@ -11,4 +11,4 @@
 /**
  *    sdk 版本
  */
-static const NSString *kQiniuVersion = @"7.2.4";
+static const NSString *kQiniuVersion = @"7.2.5";
