Merge branch 'development' of https://github.com/siacs/Conversations into development

25 files changed, 0 insertions, 0 deletions

diff --git a/src/main/res/drawable-mdpi/ic_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..67042105
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_add_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..db23fd65
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..df332ef3
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png
new file mode 100644
index 00000000..794b7b78
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png
new file mode 100644
index 00000000..e9e9c7a5
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_chat_white_48dp.png b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..526ebec6
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..5592d5c8
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_delete_white_48dp.png b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..cdb230c2
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_edit_black_48dp.png b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png
new file mode 100644
index 00000000..aa7748ad
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..b5f88c80
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_edit_white_48dp.png b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..7f0ea51b
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..e089466d
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png
new file mode 100644
index 00000000..46aeab45
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..6055325e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_group_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..0c5fd333
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_group_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..fb82f420
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..6e1321e4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..2d2c9417
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..c402e8f0
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..5f89fc25
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..efc9560e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_search_white_18dp.png b/src/main/res/drawable-mdpi/ic_search_white_18dp.png
new file mode 100644
index 00000000..d113cdcb
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_search_white_18dp.png
diff --git a/src/main/res/drawable-mdpi/ic_search_white_48dp.png b/src/main/res/drawable-mdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..043759ac
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_search_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..20d2b66e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_warning_white_36dp.png b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..30eee6c4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png