-
https://github.com/lizardlab/xabber-androidGrigory Fedorov authored
Conflicts: app/src/main/res/xml/preference_editor.xml
0faca864
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| otr4j @ ab1d28e8 | ||
| src/main | ||
| build.gradle |
Conflicts: app/src/main/res/xml/preference_editor.xml
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| otr4j @ ab1d28e8 | ||
| src/main | ||
| build.gradle |