Skip to content

Commit cd510e4

Browse files
committed
Merge upstream/alpha into feature/chart-visualization
- Resolved conflicts in changelogs/CHANGELOG_alpha.md by preserving both version entries - Regenerated package-lock.json after resolving conflicts - Resolved conflicts in src/components/AggregationPanel/AggregationPanel.scss - Updated Node.js engine requirements to match upstream dependencies - All lint checks and engine requirements are passing
2 parents 3111c90 + cfd0bce commit cd510e4

File tree

6 files changed

+28533
-27087
lines changed

6 files changed

+28533
-27087
lines changed

changelogs/CHANGELOG_alpha.md

Lines changed: 2835 additions & 1411 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)