Alexander Harkness c700108ab6 Merge branch 'master' of github.com:tigerw/MCServer into tigerw-master ...

Conflicts:
	MCServer/webadmin/template.html

2013-07-31 08:22:34 +01:00

..

(original).html

Updated Webadmin Hugely

2013-07-27 17:12:45 +01:00

template.html

Merge branch 'master' of github.com:tigerw/MCServer into tigerw-master

2013-07-31 08:22:34 +01:00

template.lua

WebAdmin templates can use Lua

2013-07-29 02:37:59 +02:00