# Conflicts:
#	app/build.gradle
#	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
#	app/src/main/res/values-hi-rIN/strings.xml
#	settings.gradle