Michael Telatynski 0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # electron_app/src/tray.js		2017-06-22 15:04:33 +01:00
..
strings	Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff	2017-06-22 15:04:33 +01:00