Merge branch 'master' into amp.chat

Change-Id: Iac4e56401aab3f7f39b623b617990ec1952f8cd0
2020-04-20 16:57:23 +02:00
parent 7aec6f9369 b7f009e559
commit e9c3901b68
12 changed files with 1541 additions and 1131 deletions
--- a/src/App.js
+++ b/src/App.js
@@ -41,6 +41,7 @@ const App = () => (
      icon={UserIcon}
    />
    <Resource name="rooms" list={RoomList} icon={RoomIcon} />
+    <Resource name="connections" />
  </Admin>
 );