ninthworld 86107de54e Merge remote-tracking branch 'upstream/master' ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2018-07-16 21:16:20 -07:00
..
assembly	Assembly fix.	2016-02-26 21:05:21 +03:00
java/mage/server	Merge remote-tracking branch 'upstream/master'	2018-07-16 21:16:20 -07:00
resources	pennydreadful update	2018-04-24 23:03:32 +10:00
xml-resources/jaxb/Config	Set SocketWriteTimeout to 10 seconds.	2017-04-17 00:01:39 +02:00