2 commits

Author	SHA1	Message	Date
Richard van der Hoff	81d95ecea0	Fix cancel button on e2e import/export dialogs ... Make sure that we preventDefault on the cancel button. Fixes https://github.com/vector-im/riot-web/issues/3066	2017-01-25 22:15:09 +00:00
Richard van der Hoff	b85f53cadd	Implement Megolm key importing	2017-01-24 21:50:24 +00:00