diff options
| author | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
| commit | e2e2479984b3aaadb4c0947e5ec15276e5c9a337 (patch) | |
| tree | 1662c1772cbcb6e44d017cea28e35d45de44921f /js/prefs.js | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'js/prefs.js')
| -rwxr-xr-x | js/prefs.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/prefs.js b/js/prefs.js index 628e66a11..69e779d45 100755 --- a/js/prefs.js +++ b/js/prefs.js @@ -919,6 +919,7 @@ function init() { "dojo/ready", "dojo/parser", "dojo/_base/loader", + "dojo/_base/html", "dijit/ColorPalette", "dijit/Dialog", "dijit/form/Button", @@ -1811,3 +1812,4 @@ function clearSqlLog() { function updateSelectedPrompt() { // no-op shim for toggleSelectedRow() } + |