Matthew Hodgson aa5587ba95 Merge branch 'develop' into kegan/translation-macaque		2017-06-01 00:36:37 +01:00
..
components	…
i18n/strings	Merge branch 'develop' into kegan/translation-macaque	2017-06-01 00:36:37 +01:00
notifications	…
skins/vector	…
utils	…
vector	Merge pull request #4119 from vector-im/kegan/translation-chimp	2017-06-01 00:34:45 +01:00
VectorConferenceHandler.js	…
header	…