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
..
build	Merge remote-tracking branch 'origin/develop'	2024-11-13 22:57:00 +00:00
dist	Merge remote-tracking branch 'origin/develop'	2024-11-13 22:57:00 +00:00
skins
webfonts	Upgrade fontawesome, generate dev assets	2024-08-10 15:51:24 +01:00
blue.png
blue@2x.png
overrides.css
overrides.css.map
signature-pad.css
signature-pad.min.css