Merge branch 'master' into ctrlaltca-patch-1

This commit is contained in:
tooomm 2020-03-31 22:04:14 +02:00 committed by GitHub
commit f14850d47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,7 +4,7 @@
We have made a new user-editable file for token modifications.
Currently this file is "TK.xml" and can be found in your customsets directory.
-->
<cockatrice_carddatabase version="4" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/Cockatrice/Cockatrice/master/doc/cards.xsd">
<cockatrice_carddatabase version="4" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/Cockatrice/Cockatrice/master/doc/carddatabase_v4/cards.xsd">
<info>
<author>Cockatrice/Magic-Token</author>
<createdAt>2020-03-29T15:52:29Z</createdAt>