Merge branch 'develop' into feature/smack
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
Showing
924 Bytes
859 Bytes
553 Bytes
536 Bytes
1.07 KB
972 Bytes
1.45 KB
1.36 KB