Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance

# Conflicts:
#	.ds.baseline
#	app/assets/javascripts/chartDashboard.js
#	app/main/views/dashboard.py
This commit is contained in:
Jonathan Bobel
2024-06-07 16:51:32 -04:00
8 changed files with 193 additions and 2 deletions

View File

@@ -131,7 +131,7 @@ const javascripts = () => {
paths.src + 'javascripts/date.js',
paths.src + 'javascripts/loginAlert.js',
paths.src + 'javascripts/main.js',
paths.src + 'javascripts/chartDashboard.js',
paths.src + 'javascripts/sampleChartDashboard.js',
])
.pipe(plugins.prettyerror())
.pipe(plugins.babel({