• 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
..
account Loading commit data...
connection Loading commit data...
entity Loading commit data...
extension Loading commit data...
intent Loading commit data...
message Loading commit data...
notification Loading commit data...
roster Loading commit data...
AbstractTable.java Loading commit data...
ActivityManager.java Loading commit data...
Application.java Loading commit data...
BaseManagerInterface.java Loading commit data...
BaseUIListener.java Loading commit data...
DatabaseManager.java Loading commit data...
DatabaseTable.java Loading commit data...
LogManager.java Loading commit data...
NetworkException.java Loading commit data...
OnClearListener.java Loading commit data...
OnCloseListener.java Loading commit data...
OnErrorListener.java Loading commit data...
OnInitializedListener.java Loading commit data...
OnLoadListener.java Loading commit data...
OnLowMemoryListener.java Loading commit data...
OnMigrationListener.java Loading commit data...
OnTimerListener.java Loading commit data...
OnUnloadListener.java Loading commit data...
OnWipeListener.java Loading commit data...
SettingsManager.java Loading commit data...
VcardMaps.java Loading commit data...