Merge branch 'MDL-35978-master-blockfix' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 03:43:38 +0000 (11:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 03:43:38 +0000 (11:43 +0800)
commit88107dc944b206557c4b0985d03258f36557ca22
tree6799789531806571de7ae69c3a9804761331991e
parentb462c655dcfddab8a7d0ffb7d80bf42ee2aa1177
parentbb80768558a4ddd755305e7b8b7925fef9d2771d
Merge branch 'MDL-35978-master-blockfix' of https://github.com/snake/moodle