Merge master into dev

2013-07-03 16:06:13 -04:00 · 2013-07-03 16:06:13 -04:00 · 860d81afbc
commit 860d81afbc
parent d34301e2e2 91a2fcb61d
5 changed files with 10 additions and 5 deletions
--- a/www/assets/js/data.js
+++ b/www/assets/js/data.js
@ -29,6 +29,7 @@ var CHANNEL = {
    css: "",
    js: "",
    motd: "",
+    motd_text: "",
    name: false
 };