Andrew Morgan f4a7f0dedd Fix some merge conflicts and up to electron 4.2.6

2019-07-12 17:39:31 +01:00

..

components

Add key to footer links to appease React

2019-03-29 15:58:41 +00:00

i18n/strings

Fix some merge conflicts and up to electron 4.2.6

2019-07-12 17:39:31 +01:00

vector

Merge branch 'develop' into anoa/jitsi_ptt

2019-07-12 16:57:01 +01:00

header

move everything not explicitly riot (or status) branded into matrix-react-sdk

2018-04-11 23:49:52 +01:00