mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-17 23:49:02 +01:00
Merged with development
This commit is contained in:
commit
abe2654352
65 changed files with 567 additions and 352 deletions
|
|
@ -57,8 +57,13 @@
|
|||
"systemId": "daggerheart",
|
||||
"systemVersion": "1.1.0",
|
||||
"createdTime": 1754253587683,
|
||||
<<<<<<< HEAD
|
||||
"modifiedTime": 1756034054698,
|
||||
"lastModifiedBy": "vUIbuan0U50nfKBE"
|
||||
=======
|
||||
"modifiedTime": 1755943555081,
|
||||
"lastModifiedBy": "tt3PwMBXcTLCtIQU"
|
||||
>>>>>>> development
|
||||
},
|
||||
"_key": "!items!4y9Ph7RsCIAbkwTk"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue