Files
element-web/src/components/structures
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
..
2017-06-01 13:31:24 +01:00
2017-05-25 11:39:08 +01:00
2017-05-30 15:09:57 +01:00
2017-05-09 17:36:19 +01:00