Merge branch 'master' into amp.chat

Change-Id: I6141964157bcb7218e2e6368a3ca8d20eb4855e9
2020-05-05 13:43:49 +02:00
parent 880223e5de c41b8ab846
commit ab649fbf70
10 changed files with 304 additions and 98 deletions
--- a/src/App.js
+++ b/src/App.js
@@ -48,6 +48,7 @@ const App = () => (
      icon={RoomIcon}
    />
    <Resource name="connections" />
+    <Resource name="servernotices" />
  </Admin>
 );