Commit Graph

2 Commits

Author SHA1 Message Date
Benjamin Dalsass
7ae86a8bf3 Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
#	css/backoffice/pages/_csv-import.scss
#	pages/ajax.render.php
2023-03-03 14:26:21 +01:00
Stephen Abello
00a25f3e8b Move datatable SCSS files under the same directory 2022-12-06 16:10:58 +01:00