Commit Graph

7 Commits (58a5b7f1547da41ae03cbe8eae6ea4ac8d458be8)

Author SHA1 Message Date
Michael Telatynski 7c1ac7aaff fix unrelated tautology
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-07 10:02:40 +01:00
Michael Telatynski 9c916cc544 Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4
 Conflicts:
	src/components/structures/MatrixChat.tsx
2020-04-30 17:41:14 +01:00
Michael Telatynski 2792988ad1 Revert "Make Screens an enum"
This reverts commit f6492918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:59:07 +01:00
Michael Telatynski f64929187a Make Screens an enum
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 10:44:35 +01:00
Michael Telatynski 4cf234197b iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 10:12:50 +01:00
Michael Telatynski 54e976f5a8 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:22:33 +01:00
Michael Telatynski 01abb61e9a C
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:08:33 +01:00