Michael Telatynski 04b86e5d1d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings ...

and i18nize webrtc stufffs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js

2017-06-01 22:56:31 +01:00

..

structures

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings

2017-06-01 22:56:31 +01:00

views

Merge pull request #990 from matrix-org/kegan/translation-marmoset

2017-06-01 21:22:00 +01:00