Commit c29bdbd
committed
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>
# Conflicts:
# public/css/dist/skins/_all-skins.css
# public/css/dist/skins/_all-skins.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/mix-manifest.jsonFile tree
6 files changed
+25
-11
lines changed- public
- css/dist/skins
- resources/assets/less/skins
6 files changed
+25
-11
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments