Files
element-web/src/i18n/strings
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
..
2017-06-11 20:42:24 +01:00
2017-06-01 00:51:56 +01:00
2017-06-01 00:51:56 +01:00
2017-06-19 17:18:38 +00:00
2017-06-18 23:54:29 +01:00
2017-06-18 23:30:50 +00:00
2017-06-18 23:54:29 +01:00
2017-05-27 11:30:14 +00:00
2017-06-18 23:54:29 +01:00
2017-06-08 22:56:09 +01:00
2017-06-18 20:37:20 +00:00
2017-06-18 23:54:29 +01:00
2017-06-18 20:37:20 +00:00
2017-06-18 23:54:29 +01:00
2017-06-19 00:01:11 +01:00
2017-06-01 00:51:56 +01:00
2017-06-19 10:38:04 +00:00
2017-06-18 23:54:29 +01:00
2017-06-04 09:52:02 +01:00
2017-06-20 09:00:47 +00:00
2017-06-06 13:07:22 +00:00
2017-06-18 23:54:29 +01:00
2017-06-19 00:01:11 +01:00
2017-06-20 09:00:47 +00:00
2017-06-19 00:01:11 +01:00
2017-06-11 20:42:24 +01:00