Commit Graph
5 Commits
Author SHA1 Message Date
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
Iosif Moldovan 7cded85341 update to swift 4.2 2018-09-27 16:14:10 +03:00
Nathan Tannar 5de6481e96 All-New ChatExample App 2018-08-11 21:57:34 -07:00
Nathan Tannar e308d81b2b Styled up Example!!! 2017-10-21 01:12:14 -07:00
Jesse SquiresandSteven Deutsch f11462ce22 Dump former MessageKit repo contents (#3)
* Dump former MessageKit repo contents

* Update MessageKit.podspec
2017-07-19 18:03:52 -05:00