• Grigory Fedorov's avatar
    Merge branch 'develop' into feature/smack · 1866beba
    Grigory Fedorov authored
    Conflicts:
    	app/src/main/AndroidManifest.xml
    	app/src/main/java/com/xabber/android/data/extension/muc/MUCManager.java
    	app/src/main/java/com/xabber/android/ui/ConferenceAddFragment.java
    1866beba
Name
Last commit
Last update
..
MemorizingTrustManager @ 8b80fb17 Loading commit data...
otr4j @ 0ced8409 Loading commit data...
src Loading commit data...
build.gradle Loading commit data...