Merge branch 'MDL-46768-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 04:18:54 +0000 (17:18 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 04:18:54 +0000 (17:18 +1300)
commit7315358ead15574c92cf5204639cb3796d2ba459
tree920aaded45b65c4df426d6df8acb7ec3398dad63
parent081ac9152627a44dbccfae7be17aa160ce3441e0
parentd77a6026d2e0dd7268b6a8be5eea95f6aefbaa27
Merge branch 'MDL-46768-master' of git://github.com/sarjona/moodle