Diego Mello c1d42d332a Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/app/src/debug/res/values/strings.xml # app/index.js # app/sagas/login.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-04-07 10:16:38 -03:00
..
Header	Create single-server	2020-03-11 14:32:51 -03:00
ListHeader	[FIX] Spotlight (#1719)	2020-02-13 16:24:39 -03:00
SortDropdown	[NEW] Themes (#1298)	2019-12-04 13:39:53 -03:00
ServerDropdown.js	[FIX] Add server and hide login (#1968)	2020-04-01 12:56:08 -03:00
index.js	[FIX] Investigate app losing connection issues (#1890)	2020-04-03 15:03:53 -03:00
styles.js	[NEW] Themes (#1298)	2019-12-04 13:39:53 -03:00