Giom Foret 7daa966116 Merge branch 'master' into callkit ... # Conflicts: # Riot/AppDelegate.m # Riot/Assets/en.lproj/Vector.strings # Riot/ViewController/SettingsViewController.m		2017-08-25 16:48:13 +02:00
..
API	Remove MXKAlert class use.	2017-07-14 16:41:25 +02:00
Assets	Merge branch 'master' into callkit	2017-08-25 16:48:13 +02:00
Base.lproj	Dark Theme - Bug Fix	2017-08-14 16:43:30 +02:00
Categories	Bug Fix - Dark theme - Improvements #1444	2017-08-25 13:53:17 +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: Improve cooking recipe for building jitsi-meet ios framework	2017-08-18 15:57:18 +02:00
Model	Jitsi widget: always accept to join ongoing jitsi conf. Only the creation is under the settings	2017-08-17 18:59:58 +02:00
Utils	Disable the display of jitsi conference widget.	2017-08-25 14:04:26 +02:00
ViewController	Merge branch 'master' into callkit	2017-08-25 16:48:13 +02:00
Views	Merge branch 'develop' into app-extension	2017-08-22 17:35:11 +02:00
AppDelegate.h	Improvements in notification registration flow	2017-08-23 19:07:14 +03:00
AppDelegate.m	Merge branch 'master' into callkit	2017-08-25 16:48:13 +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-25 15:01:09 +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	Change app group to group.im.vector	2017-08-16 18:30:42 +01:00
third_party_licenses.html	Jitsi widget: Add license notice for jitsi-meet	2017-08-18 09:32:06 +02:00