Skip to content

Commit

Permalink
Merge branch 'master' into fix/pivot-tables-legend-value-type
Browse files Browse the repository at this point in the history
  • Loading branch information
janhenrikoverland authored Jun 25, 2024
2 parents 027ed8e + e1ef741 commit 46dcf21
Show file tree
Hide file tree
Showing 4 changed files with 1,634 additions and 17 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [26.7.5](https://github.com/dhis2/analytics/compare/v26.7.4...v26.7.5) (2024-06-25)


### Bug Fixes

* update multicalendar dep for translations (DHIS2-16904) ([#1685](https://github.com/dhis2/analytics/issues/1685)) ([b3a48ba](https://github.com/dhis2/analytics/commit/b3a48ba8cff9956468a2670c0dda16549247bd18))

## [26.7.4](https://github.com/dhis2/analytics/compare/v26.7.3...v26.7.4) (2024-06-20)


Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/analytics",
"version": "26.7.4",
"version": "26.7.5",
"main": "./build/cjs/index.js",
"module": "./build/es/index.js",
"exports": {
Expand Down Expand Up @@ -59,7 +59,7 @@
"styled-jsx": "^4.0.1"
},
"dependencies": {
"@dhis2/multi-calendar-dates": "1.0.0",
"@dhis2/multi-calendar-dates": "^1.2.2",
"@dnd-kit/core": "^6.0.7",
"@dnd-kit/sortable": "^7.0.2",
"@dnd-kit/utilities": "^3.2.1",
Expand Down
Loading

0 comments on commit 46dcf21

Please sign in to comment.