Merge branch 'MDL-62334-master' of https://github.com/danielneis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 20:50:41 +0000 (22:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 20:50:41 +0000 (22:50 +0200)
commit0ddc272116c362868b056cd9802e0f4084841c55
tree628c37dcb6940c21c5733e1f3387f647d05c51c4
parentb687205e2732d93b8715104064a852c233e5deb5
parent28af88f364121306be40844acd9ef72f6e2f6726
Merge branch 'MDL-62334-master' of https://github.com/danielneis/moodle