• 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
..
MUCManager.java Loading commit data...
Occupant.java Loading commit data...
RoomAuthorizationError.java Loading commit data...
RoomChat.java Loading commit data...
RoomContact.java Loading commit data...
RoomInvite.java Loading commit data...
RoomState.java Loading commit data...
RoomTable.java Loading commit data...