manuroe f13baec441 Merge remote-tracking branch 'origin/develop' into jitsi_widget ... # Conflicts: # Riot.xcodeproj/project.pbxproj		2017-08-16 17:14:20 +02:00
..
API	Remove MXKAlert class use.	2017-07-14 16:41:25 +02:00
Assets	Merge remote-tracking branch 'origin/develop' into jitsi_widget	2017-08-16 17:14:20 +02:00
Base.lproj	Dark Theme - Bug Fix	2017-08-14 16:43:30 +02:00
Categories	Enable Dark theme	2017-08-11 16:56:09 +02:00
Images.xcassets/AppIcon.appiconset	Rebranding: replace Vector by Riot everywhere in the git and github repos	2017-03-08 11:08:03 +01:00
libs/jitsi-meet	Jitsi widget: Add a readme with intructions for building JitsiMeet.framework	2017-08-04 14:20:15 +02:00
Model	Merge remote-tracking branch 'origin/develop' into jitsi_widget	2017-08-16 17:14:20 +02:00
Utils	Merge remote-tracking branch 'origin/develop' into jitsi_widget	2017-08-16 17:14:20 +02:00
ViewController	Merge remote-tracking branch 'origin/develop' into jitsi_widget	2017-08-16 17:14:20 +02:00
Views	Merge remote-tracking branch 'origin/develop' into jitsi_widget	2017-08-16 17:14:20 +02:00
AppDelegate.h	Jitsi widget: Manage "Back To App"	2017-08-11 14:18:10 +02:00
AppDelegate.m	Merge remote-tracking branch 'origin/develop' into jitsi_widget	2017-08-16 17:14:20 +02:00
empty.mm	Rebranding: replace Vector by Riot everywhere in the git and github repos	2017-03-08 11:08:03 +01:00
GoogleService-Info.plist	Rebranding: replace Vector by Riot everywhere in the git and github repos	2017-03-08 11:08:03 +01:00
Info.plist	version++	2017-08-08 15:48:25 +02:00
main.m	Rebranding: replace Vector by Riot everywhere in the git and github repos	2017-03-08 11:08:03 +01:00
Riot-Defaults.plist	UX Rework - Home: Put the new ordering behind a setting.	2017-06-16 15:18:33 +02:00
Riot.entitlements	Set the application group to be able to share userDefaults object.	2017-08-16 15:35:38 +02:00
third_party_licenses.html	Third-party notices: We now use cmark in place of GHMarkdownParser	2017-04-28 15:46:49 +02:00