Resolved merge conflicts

This commit is contained in:
Andrii V 2025-11-24 15:29:54 +01:00
commit 5e477a58a2
38 changed files with 212 additions and 180 deletions

View file

@ -32,7 +32,7 @@
"src": [
"<%= dirs.js.node_modules %>/jquery/dist/jquery.min.js",
"<%= dirs.js.node_modules %>/mousetrap/mousetrap.min.js",
"<%= dirs.js.node_modules %>/moment/min/moment.min.js",
"<%= dirs.js.node_modules %>/luxon/build/global/luxon.min.js",
"<%= dirs.js.node_modules %>/clipboard/dist/clipboard.min.js",
"<%= dirs.js.node_modules %>/favico.js/favico-0.3.10.min.js",
"<%= dirs.js.node_modules %>/dropzone/dist/min/dropzone.min.js",