Diego Mello 4e437e3269 Merge branch 'develop' into single-server ... # Conflicts: # README.md # android/app/src/debug/AndroidManifest.xml # android/gradle.properties # app/views/RoomsListView/Header/Header.js # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/RocketChatRN.entitlements		2020-08-10 14:35:47 -03:00
..
xcshareddata/xcschemes	[NEW] Push notification data privacy (#2213)	2020-07-28 10:43:43 -03:00
project.pbxproj	Merge branch 'develop' into single-server	2020-08-10 14:35:47 -03:00