-
https://github.com/aelmahmoudy/xabber-androidGrigory Fedorov authored
Merge branch 'update_otr' of https://github.com/aelmahmoudy/xabber-android into aelmahmoudy-update_otr Conflicts: app/otr4j
9a6be6fa
| Name |
Last commit
|
Last update |
|---|---|---|
| app | ||
| gradle/wrapper | ||
| scripts | ||
| .gitignore | ||
| .gitmodules | ||
| LICENSE | ||
| README.rst | ||
| build.gradle | ||
| gradlew | ||
| gradlew.bat | ||
| settings.gradle |