Merge remote-tracking branch 'origin/demo' into starter

# Conflicts:
#	src/app/mock-api/common/navigation/data.ts
#	src/app/modules/admin/docs/changelog/changelog.ts
This commit is contained in:
sercan
2021-04-26 09:56:44 +03:00
3 changed files with 295 additions and 205 deletions

View File

@@ -1,4 +1,4 @@
import { Version } from '@fuse/version/version';
const __FUSE_VERSION__ = '12.0.0';
const __FUSE_VERSION__ = '12.1.0';
export const FUSE_VERSION = new Version(__FUSE_VERSION__).full;