3 Commits

Author	SHA1	Message	Date
David Baker	f928be6f59	Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental" ... This reverts commit ad47144355.	2019-01-03 15:37:03 -07:00
David Baker	7d161de35b	Partial merge of develop to experimental ... Does not include #2336 as the file has been moved out from underneath it: will do this separately	2019-01-03 15:02:58 +00:00
David Baker	4f8c4f1c6e	Make create key backup dialog async ... So we can add zxcvbn to it without inflating the main bundle size	2018-11-23 10:55:18 +00:00