Commit eeafc4ee authored by fallenstardust's avatar fallenstardust

Merge branch 'master' of https://github.com/fallenstardust/YGOMobile-cn-ko-en

# Conflicts:
#	mobile/src/main/java/cn/garymb/ygomobile/ui/plus/ServiceDuelAssistant.java
parents 71d35906 f08a3642
......@@ -9,6 +9,13 @@
<port>8005</port>
<keep>true</keep>
</server>
<server>
<player-name>Knight of Hanoi</player-name>
<name>Szefo server (Links +TCG)</name>
<ip>szefoserver.ddns.net</ip>
<port>7210</port>
<keep>true</keep>
</server>
<server>
<player-name>Knight of Hanoi</player-name>
<name>Mercury233 OCG</name>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment