snipe eb57652548 Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/skins/_all-skins.css # public/css/dist/skins/_all-skins.min.css # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/mix-manifest.json		2024-11-13 22:57:00 +00:00
..
skins	Merge remote-tracking branch 'origin/develop'	2024-11-13 22:57:00 +00:00
_all.css
aero.css
aero.png
aero@2x.png
all.css	Merge remote-tracking branch 'origin/develop'	2024-11-13 22:57:00 +00:00
blue.css
blue.png
blue@2x.png
bootstrap-table.css	Merge remote-tracking branch 'origin/develop'	2024-11-06 21:26:21 +00:00
green.css
green.png
green@2x.png
grey.css
grey.png
grey@2x.png
minimal.css
minimal.png
minimal@2x.png
orange.css
orange.png
orange@2x.png
pink.css
pink.png
pink@2x.png
purple.css
purple.png
purple@2x.png
red.css
red.png
red@2x.png
signature-pad.css
signature-pad.min.css	Generated prod assets	2024-09-29 11:25:47 +01:00
yellow.css
yellow.png
yellow@2x.png