Iosif Moldovan
|
46d9f1c4d9
|
Merge branch 'development' of https://github.com/MessageKit/MessageKit into audio_message_support
# Conflicts:
# Cartfile.resolved
# Example/ChatExample.xcodeproj/project.pbxproj
# Example/Podfile.lock
# Example/Sources/AppDelegate.swift
# Example/Sources/ConversationViewController.swift
# Example/Sources/Data Generation/SampleData.swift
# Example/Sources/View Controllers/LaunchViewController.swift
# MessageKit.xcodeproj/project.pbxproj
# MessageKit.xcodeproj/xcshareddata/xcschemes/MessageKit.xcscheme
# MessageKit.xcodeproj/xcshareddata/xcschemes/MessageKitTests.xcscheme
# Sources/Controllers/MessagesViewController+Keyboard.swift
# Sources/Views/InputBarItem.swift
# Sources/Views/InputStackView.swift
# Sources/Views/InputTextView.swift
# Sources/Views/MessageInputBar.swift
# Tests/ViewsTests/InputBarItemTests.swift
|
2018-10-01 10:44:34 +03:00 |
|