Merge branch 'MDL-60762-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 27 Mar 2018 07:47:58 +0000 (15:47 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:12 +0000 (18:16 +0200)
commit51c6cfb69a0cbcc1d85fb4763aaf3775548baac9
treebf0494e28ee513dad9b6cfebb923985eadcca423
parent99feb82ab55924e6fc06248994d5fbe4556a4b87
parent7ccb6bb3ccf4b4bdc5cad650aa5ddcf886a2e69a
Merge branch 'MDL-60762-master' of git://github.com/junpataleta/moodle