app/src/main/java/com/xabber/android/ui/ConferenceAddFragment.java · 1b8c4a0b7151f62b3200d58b7d2453738059117a · Administrator / xabber-android

Merge branch 'develop' into feature/smack · 1866beba

Grigory Fedorov authored Jul 28, 2015

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

ConferenceAddFragment.java 4.21 KB

Technounit-GROUP 2023

Replace ConferenceAddFragment.java