Merge branch 'MDL-61614-master' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 21:13:07 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 21:13:07 +0000 (23:13 +0200)
commit3271e83c6e4470bbd2b36fd99ebe1590fc7e5073
tree3f35eb23a647160134e406eb8c6012e73fefb7a5
parentf5779bb101eee6335969ee8a153531e1997e432e
parent9da6f4d968aadc5322581bba55dd47e14c968220
Merge branch 'MDL-61614-master' of git://github.com/rezaies/moodle