manuroe 0556ef2ee2 Merge remote-tracking branch 'origin/develop' into lazy_loading ... # Conflicts: # CHANGES.rst # Riot/Modules/Room/RoomViewController.m		2018-08-07 18:06:58 +02:00
..
InfoPlist.strings	Update contact permission text (NSContactsUsageDescription), only for english and french at the moment, in order to be clearer about the reasons for access to the address book.	2018-07-13 15:49:56 +02:00
Localizable.strings	Missing Push Notifications (#1696): Show a notification even if the app fails to sync with its hs to get all data.	2017-12-29 13:19:40 +01:00
Vector.strings	Merge remote-tracking branch 'origin/develop' into lazy_loading	2018-08-07 18:06:58 +02:00