Merge branch 'MDL-53004-master' of https://github.com/lucaboesch/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 05:18:03 +0000 (13:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 05:18:03 +0000 (13:18 +0800)
commitd87a31d878d1512eecff8b29187e8ad1f6dfe598
tree5d310f7b7dcd6f2359bc8c96399efd41a4500d81
parent7315358ead15574c92cf5204639cb3796d2ba459
parent409758c035f0bb72ba47ee6af2ad9cbfa198bd69
Merge branch 'MDL-53004-master' of https://github.com/lucaboesch/moodle

Conflicts:
mod/assign/styles.css
mod/assign/styles.css