Merge branch 'dev' into profile-pictures

This commit is contained in:
nielsandriesse
2020-09-09 13:14:46 +10:00
84 changed files with 646 additions and 373 deletions

View File

@@ -25,6 +25,7 @@
<color name="compose_text_view_background">#141414</color>
<color name="quote_not_found_background">#99FFFFFF</color>
<color name="new_conversation_button_collapsed_background">#1F1F1F</color>
<color name="new_conversation_button_shadow">#077C44</color>
<color name="pn_option_background">#1B1B1B</color>
<color name="pn_option_border">#212121</color>
<color name="paths_building">#FFCE3A</color>