Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts: view/nl/messages.po
2015-08-17 16:14:15 -07:00
parent be3a272a80 4ebee195cc
commit 30fd17c58d
6 changed files with 302 additions and 302 deletions
--- a/view/css/mod_admin.css
+++ b/view/css/mod_admin.css
@@ -61,7 +61,7 @@
 #adminpage table tr:hover { background-color: #bbc7d7; }
 #adminpage .selectall { text-align: right; }

-.checkbox {
+.checkbox_bulkedit {
   width: 1.2em;
   height: 1.2em;
 }