Diego Mello 59bc3e8a46 Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # app/sagas/login.js		2020-11-09 18:33:57 -03:00
..
MasterDetailStack	[IMPROVEMENT] Add `Change Encryption Password` and `Reset E2E Key` (#2542)	2020-10-30 15:31:04 -03:00
InsideStack.js	[IMPROVEMENT] Add `Change Encryption Password` and `Reset E2E Key` (#2542)	2020-10-30 15:31:04 -03:00
OutsideStack.js	fix: error 'root' is defined but never used no-unused-vars (#2460)	2020-09-14 09:47:50 -03:00