MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button)
authorDamyon Wiese <damyon@moodle.com>
Tue, 1 Oct 2013 03:58:15 +0000 (11:58 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 1 Oct 2013 03:58:15 +0000 (11:58 +0800)
commit900f571c3a9ef59f2787827c9713e05df319aff3
treedecf8cc20a52e8d41529a075140bdd3e4a81a984
parent0af463d41328ca52be42fe8561dc624f72798228
MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button)
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
lib/editor/atto/plugins/link/yui/src/button/js/button.js