-
Grigory Fedorov authored
Conflicts: app/src/main/java/com/xabber/android/ui/ContactList.java
f4b716b6
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| otr4j @ 0ced8409 | ||
| src | ||
| build.gradle |
Conflicts: app/src/main/java/com/xabber/android/ui/ContactList.java
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| otr4j @ 0ced8409 | ||
| src | ||
| build.gradle |