• 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
app Loading commit data...
gradle/wrapper Loading commit data...
scripts Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
LICENSE Loading commit data...
README.rst Loading commit data...
build.gradle Loading commit data...
gradlew Loading commit data...
gradlew.bat Loading commit data...
settings.gradle Loading commit data...