Merge branch 'master' into 'v1.3'

Browse Source

# Conflicts:
#   module/actor.js
#   module/rdd-combat.js
#   module/rdd-resolution-table.js
#   module/rdd-roll.js
#   system.json
#   templates/chat-resultat-parade.html

...

This commit is contained in:

Leratier Bretonnien 2021-02-27 22:06:27 +00:00

parent 8ddd47844f 68cd2cef33

commit 33b676e214

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available