Merge branch 'master' into new-design

2016-02-01 05:41:24 -06:00 · 2016-02-01 05:41:24 -06:00 · 6e620e759f
commit 6e620e759f
parent ff503f6036 bc100a661d
1 changed files with 1 additions and 1 deletions
--- a/servers.json
+++ b/servers.json
@ -155,7 +155,7 @@
 		"type": "PC"
 	},
 	{
- 		"name": "Empire Minecraft",
+ 		"name": "Empire MC",
 		"ip": "play.emc.gs",
 		"type": "PC"
  	}