Merge remote-tracking branch 'origin/master' into js-cleanup

This commit is contained in:
kasimi committed 2015-12-14 13:20:23 +01:00
commit 1754bb729f
4 files changed
+6 -10

No files matched your search

@@ -5,11 +5,9 @@
<!-- INCLUDEJS editor.js -->
<!-- INCLUDEJS jquery.titlealert.min.js -->
<!-- INCLUDEJS jquery_cookie_mini.js -->
<!-- INCLUDEJS jquery-1.8.3.min.js -->
<!-- INCLUDEJS jquery.maxlength.min.js -->
<!-- INCLUDEJS mchat.min.js -->
<!-- IF MCHAT_ARCHIVE_MODE -->
<!--**
*