Merge branch 'MDL-62078-master' of git://github.com/sarjona/moodle
commit8fbff1d453bd90a6a14065d26123f495a721357c
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Apr 2018 10:05:46 +0000 (23 12:05 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Apr 2018 10:05:46 +0000 (23 12:05 +0200)
treee334f119c49317cc8beea5680022515bfade7ecb
parent74d0a7f975dfa34e3ab6b2c8903c54849788bd02
parentb720d9dae83b23a0d01d5da31382cf56ffa8e044
Merge branch 'MDL-62078-master' of git://github.com/sarjona/moodle