Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
nixzhu
2015-04-27 17:23:54 +08:00
@@ -1288,7 +1288,7 @@ extension ConversationViewController: UIImagePickerControllerDelegate, UINavigat
if let videoData = NSData(contentsOfURL: videoURL) {
if let messageVideoURL = NSFileManager.saveMessageImageData(videoData, withName: messageVideoName) {
if let messageVideoURL = NSFileManager.saveMessageVideoData(videoData, withName: messageVideoName) {
let realm = message.realm
realm.beginWriteTransaction()