Merge branch 'MDL-55557_m32v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 11:45:18 +0000 (12:45 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 11:45:18 +0000 (12:45 +0100)
commit293857b5ebf1e9871d05efc37296321b9e1a6647
treece133d332635bde7a32f2a6a172539431c19bec2
parent6f9f149b046eaace9c6e8aefbee81c5ff3c116cf
parent6ffb8fa21a50c77bc89cb03822ab1e43ac96788e
Merge branch 'MDL-55557_m32v1' of https://github.com/sbourget/moodle
mod/wiki/locallib.php