Merge branch 'master' into stoutford_tests

This commit is contained in:
Zukero
2017-08-18 11:54:41 +02:00

View File

@@ -89,6 +89,7 @@
<array name="loadresource_conversationlists">
<item>@raw/conversationlist_mikhail</item>
<item>@raw/conversationlist_mikhail_foodpoison</item>
<item>@raw/conversationlist_crossglen</item>
<item>@raw/conversationlist_crossglen_gruil</item>
<item>@raw/conversationlist_crossglen_leonid</item>