Merge branch 'develop' of https://github.com/vector-im/riot-ios into share-extension

This commit is contained in:
Aram Sargsyan
2017-07-30 21:30:48 +04:00
28 changed files with 1856 additions and 93 deletions
+2 -1
View File
@@ -169,7 +169,8 @@
"contacts_address_book_no_contact" = "No local contacts";
"contacts_address_book_permission_required" = "Permission required to access local contacts";
"contacts_address_book_permission_denied" = "You didn't allow Riot to access your local contacts";
"contacts_matrix_users_section" = "KNOWN CONTACTS";
"contacts_user_directory_section" = "USER DIRECTORY";
"contacts_user_directory_offline_section" = "USER DIRECTORY (offline)";
// Chat participants
"room_participants_title" = "Participants";