Skip to content

Commit

Permalink
Merge branch 'release/2.25.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Lakeyzer committed May 15, 2024
2 parents e5acd4a + 193080c commit 5cc1f87
Show file tree
Hide file tree
Showing 47 changed files with 2,134 additions and 1,629 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.24.6",
"version": "2.25.0",
"name": "shieldmaiden",
"description": "A Dungeons and Dragons Combat Tracker",
"productName": "Shieldmaiden",
Expand Down
2 changes: 2 additions & 0 deletions src/boot/hk-components.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import HkActionRollsTable from "../components/hk-components/hk-action-rolls/hk-a
import HkActionRollScaling from "../components/hk-components/hk-action-rolls/hk-action-roll-scaling";
import HkPane from "../components/hk-components/hk-pane";
import HkFilter from "../components/hk-components/hk-filter";
import HkTransformSelect from "../components/hk-components/hk-transform-select";

export default async ({ Vue }) => {
Vue.component("hk-input", HkInput);
Expand Down Expand Up @@ -54,4 +55,5 @@ export default async ({ Vue }) => {
Vue.component("hk-action-roll-scaling", HkActionRollScaling);
Vue.component("hk-pane", HkPane);
Vue.component("hk-filter", HkFilter);
Vue.component("hk-transform-select", HkTransformSelect);
};
Loading

0 comments on commit 5cc1f87

Please sign in to comment.