various mergefixes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-22 21:37:42 +10:00
parent e645d78f11
commit 283ae84dad
5 changed files with 7 additions and 816 deletions
+1 -1
View File
@@ -104,7 +104,7 @@
world.update_status()
..() //calls mob.Login()
makejson()
//makejson()
if(custom_event_msg && custom_event_msg != "")
src << "<h1 class='alert'>Custom Event</h1>"