mirror of
https://github.com/OMGeeky/andors-trail.git
synced 2026-02-23 15:38:29 +01:00
Merge branch 'master' into stoutford_tests
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user