Skip to content

Commit

Permalink
Merge branch 'release/2.15.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Lakeyzer committed Jun 2, 2023
2 parents c4f17c1 + 45906ad commit bba6e0b
Show file tree
Hide file tree
Showing 30 changed files with 1,784 additions and 1,320 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.14.5",
"version": "2.15.0",
"name": "harmless_key",
"description": "A Dungeons and Dragons Combat Tracker",
"productName": "Harmless Key",
Expand Down
2 changes: 2 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ export default {
await store.dispatch("initialize");
},
async mounted() {
this.setTips();
const cookies = document.cookie.split(";");
for (let cookie of cookies) {
Expand Down Expand Up @@ -318,6 +319,7 @@ export default {
"initialize",
"reinitialize",
"setUser",
"setTips",
]),
setSize(size) {
this.small_screen = size.width < 576;
Expand Down
Loading

0 comments on commit bba6e0b

Please sign in to comment.