Merge branch 'MDL-50446-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 22:11:42 +0000 (00:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 22:11:42 +0000 (00:11 +0200)
commit1dce5c99c8573f5cb7bb2059950fcf3a2fb18334
tree31ee564b0b8ebfec0a45a0390a1ecda80b36b138
parentb7759a1889b32b19b987b1fe504b06463f20e033
parentfd4eca115ab1f7864504e8b80a7129ed23572d60
Merge branch 'MDL-50446-master' of git://github.com/ryanwyllie/moodle
blocks/site_main_menu/block_site_main_menu.php