Skip to content

Commit c024b4f

Browse files
Merge branch '2.5' of github.com:sulu/skeleton into 2.6
Conflicts: composer.json public/build/admin/main.2d1ed8c203eb02fcd883.css public/build/admin/main.2d1ed8c203eb02fcd883.js public/build/admin/main.2d1ed8c203eb02fcd883.js.map public/build/admin/main.7dd0d023ca48ee986043.js.map public/build/admin/main.b4a850e0494cb3498980.js.map public/build/admin/manifest.json
2 parents 4a2e773 + 106a76b commit c024b4f

8 files changed

+17
-17
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"scheb/2fa-email": "^7.2",
4242
"scheb/2fa-trusted-device": "^7.2",
4343
"stof/doctrine-extensions-bundle": "^1.11",
44-
"sulu/sulu": "^2.6.x-dev",
44+
"sulu/sulu": "~2.6.6",
4545
"symfony/config": "^7.1",
4646
"symfony/dotenv": "^7.1",
4747
"symfony/flex": "^1.17 || ^2.0",

public/build/admin/main.7dd0d023ca48ee986043.css public/build/admin/main.23106151c27dd616377c.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/admin/main.7dd0d023ca48ee986043.css.map public/build/admin/main.23106151c27dd616377c.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/admin/main.23106151c27dd616377c.js

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/admin/main.7dd0d023ca48ee986043.js.map public/build/admin/main.23106151c27dd616377c.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/admin/main.7dd0d023ca48ee986043.js

-9
This file was deleted.

public/build/admin/manifest.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"main.css": "/build/admin/main.7dd0d023ca48ee986043.css",
3-
"main.js": "/build/admin/main.7dd0d023ca48ee986043.js",
2+
"main.css": "/build/admin/main.23106151c27dd616377c.css",
3+
"main.js": "/build/admin/main.23106151c27dd616377c.js",
44
"fa-solid-900.svg": "/build/admin/fa-solid-900.7a8b4f130182d19a2d7c.svg",
55
"fa-brands-400.svg": "/build/admin/fa-brands-400.2f517e09eb2ca6650ff5.svg",
66
"fa-solid-900.eot": "/build/admin/fa-solid-900.9bbb245e67a133f6e486.eot",
@@ -77,6 +77,6 @@
7777
"images/layers.png": "/build/admin/images/layers.416d91365b44e4b4f477.png",
7878
"images/marker-shadow.png": "/build/admin/images/marker-shadow.a0c6cc1401c107b501ef.png",
7979
"images/checkerBackground.gif": "/build/admin/images/checkerBackground.9883f9a87851b3f982e6.gif",
80-
"main.css.map": "/build/admin/main.7dd0d023ca48ee986043.css.map",
81-
"main.js.map": "/build/admin/main.7dd0d023ca48ee986043.js.map"
80+
"main.css.map": "/build/admin/main.23106151c27dd616377c.css.map",
81+
"main.js.map": "/build/admin/main.23106151c27dd616377c.js.map"
8282
}

0 commit comments

Comments
 (0)