Merge branch 'master' into translators

2016-12-19 18:15:12 +01:00
parent 7563311a19 b9f2b16d24
commit 024afdfd3d
149 changed files with 1149 additions and 416 deletions
--- a/sites/all/modules/gui/materiobasemod/materio_admin.module
+++ b/sites/all/modules/gui/materiobasemod/materio_admin.module
@@ -30,7 +30,7 @@ function materio_admin_permission() {
 */
 function materio_admin_menu() {

-  $items['admin/users/duplicatemails'] = array(
+  $items['admin/people/duplicatemails'] = array(
    'title' => "Duplicate mails",
    'page callback' => 'materio_duplicatemails',
    'access callback' => 'user_access',