Merge branch 'master' into 'v1.2'

# Conflicts:
#   module/actor.js
#   module/rdd-roll.js
#   system.json
This commit is contained in:
2021-01-22 16:12:14 +00:00
2 changed files with 5 additions and 5 deletions

View File

@ -291,7 +291,7 @@
"secondaryTokenAttribute": "sante.endurance",
"socket": true,
"url": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/",
"manifest": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/raw/v1.2/system.json",
"download": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/-/archive/v1.2/foundryvtt-reve-de-dragon-master.zip",
"manifest": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/raw/master/system.json",
"download": "https://gitlab.com/LeRatierBretonnien/foundryvtt-reve-de-dragon/-/archive/master/foundryvtt-reve-de-dragon-master.zip",
"license": "LICENSE.txt"
}