Skip to content

Commit

Permalink
Merge branch '2.2' of github.com:sulu/skeleton into 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
niklasnatter committed Feb 4, 2021
2 parents 3d2863c + 1fb541e commit c9640ee
Show file tree
Hide file tree
Showing 5 changed files with 339 additions and 339 deletions.
10 changes: 0 additions & 10 deletions public/build/admin/main.4cc2f81e97c7a36a7e7a.css

This file was deleted.

10 changes: 10 additions & 0 deletions public/build/admin/main.4df079df401aaf9a09d9.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/build/admin/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"main.css": "build/admin/main.4cc2f81e97c7a36a7e7a.css",
"main.js": "build/admin/main.4cc2f81e97c7a36a7e7a.js",
"main.js.map": "build/admin/main.4cc2f81e97c7a36a7e7a.js.map",
"main.css": "build/admin/main.4df079df401aaf9a09d9.css",
"main.js": "build/admin/main.4df079df401aaf9a09d9.js",
"main.js.map": "build/admin/main.4df079df401aaf9a09d9.js.map",
"/build/admin/fonts/font-awesome.min.css": "/build/admin/fonts/fontawesome-webfont.f691f37e57f04c152e2315ab7dbad881.woff",
"/build/admin/fonts/global.scss": "/build/admin/fonts/open-sans-v15-latin-regular.ec806460121999bcfb12bc264d46d41e.woff2",
"/build/admin/fonts/sulu-icon.css": "/build/admin/fonts/sulu.7918956d252a916c3102478369c134b8.ttf",
Expand Down

0 comments on commit c9640ee

Please sign in to comment.