Michael Telatynski dcd99ac3de Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings ... # Conflicts: # src/components/structures/UserSettings.js # src/i18n/strings/en_EN.json First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>		2017-05-30 23:54:57 +01:00
..
strings	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings	2017-05-30 23:54:57 +01:00