Merge branch 'MDL-55461_atto_equation' of git://github.com/davosmith/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Jan 2017 10:51:23 +0000 (10:51 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Jan 2017 10:51:23 +0000 (10:51 +0000)
commit1975dcf25c86b63f4b2f23562afda0a8ae441d29
tree1316fe894bdd6fd8d9fb95cf10397de5d9d874fb
parentfc893bc42d44cd6b36801b089d7bbc0bf8e1309c
parent46045db2bda087e1c55a28730e0d1b8b15639c9e
Merge branch 'MDL-55461_atto_equation' of git://github.com/davosmith/moodle