Merge pull request #4857 from spjspj/master

Browse source

pennydreadful update

...

This commit is contained in:

spjspj 2018-04-24 23:05:19 +10:00 committed by GitHub

parent 1f2f61e945 5746a40ad2

commit f1b79bb902

No known key found for this signature in database

GPG key ID: 4AEE18F83AFDEB23

2 changed files with 4072 additions and 3744 deletions

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

3908

Mage.Client/src/main/resources/mage/client/deckeditor/pennydreadful.properties

View file

File diff suppressed because it is too large Load diff

3908

Mage.Server/src/main/resources/mage/deck/pennydreadful.properties

View file

File diff suppressed because it is too large Load diff