Merge branch 'MDL-58928-alt-attribute-enrolment-edit-delete-icons' of https://github...
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 06:54:05 +0000 (14:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 06:54:05 +0000 (14:54 +0800)

Trivial merge