Diego Mello 3eb4545c6b Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/gradle.properties # app/sagas/init.js # app/sagas/login.js # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-05-25 17:33:45 -03:00
..
actions	[NEW] Livechat (#2004)	2020-05-08 14:36:10 -03:00
constants	Merge branch 'develop' into single-server	2020-05-25 17:33:45 -03:00
containers	[TESTS] Update and separate E2E tests (#2126)	2020-05-20 13:33:40 -03:00
i18n	[i18n] Added missing German translation strings (#2105)	2020-05-18 14:37:04 -03:00
lib	Merge branch 'develop' into single-server	2020-05-25 17:33:45 -03:00
notifications	Update all dependencies (#2008)	2020-05-08 13:37:49 -03:00
presentation	[NEW] Livechat (#2004)	2020-05-08 14:36:10 -03:00
reducers	[NEW] Livechat (#2004)	2020-05-08 14:36:10 -03:00
sagas	Merge branch 'develop' into single-server	2020-05-25 17:33:45 -03:00
selectors	[FIX] Add server and hide login (#1968)	2020-04-01 12:56:08 -03:00
static/images	Several fixes for 1.2.1 (#448)	2018-09-19 11:18:32 -03:00
utils	[FIX] No send data to bugsnag if it's an aborted request (#2133)	2020-05-20 09:56:36 -03:00
views	Merge branch 'develop' into single-server	2020-05-25 17:33:45 -03:00
ReactotronConfig.js	[CHORE] Bugsnag logging setup (#1145)	2019-08-23 10:18:47 -03:00
commands.js	[NEW] Tablet support (#1300)	2019-11-25 17:01:17 -03:00
emojis.js	[FIX] Remove unrecognized emoji flags on android (#1887)	2020-03-17 17:19:18 -03:00
index.js	Merge branch 'develop' into single-server	2020-05-25 17:33:45 -03:00
share.js	[NEW] Passcode and biometric unlock (#2059)	2020-05-08 14:04:37 -03:00
split.js	[NEW] Tablet support (#1300)	2019-11-25 17:01:17 -03:00
tablet.js	[NEW] Custom Status (#1811)	2020-03-30 17:19:01 -03:00
theme.js	[NEW] UiKit Beta (#1497)	2020-02-11 11:01:35 -03:00