MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-21 15:53:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/react-admin

Browse Source
This commit is contained in:
Matthew Penner
2021-02-07 16:16:22 -07:00
parent 8e07bb4bc2 00da092e45
commit a87fef37ec
77 changed files with 1082 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/components/App.tsx
View File

@@ -9,7 +9,7 @@ import ServerRouter from '@/routers/ServerRouter';
import AuthenticationRouter from '@/routers/AuthenticationRouter';
import { SiteSettings } from '@/state/settings';
import ProgressBar from '@/components/elements/ProgressBar';
import NotFound from '@/components/screens/NotFound';
import { NotFound } from '@/components/elements/ScreenBlock';
import tw from 'twin.macro';
import GlobalStylesheet from '@/assets/css/GlobalStylesheet';
import { history } from '@/components/history';