diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-07-20 20:23:21 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-07-20 20:23:21 +0400 |
| commit | 6dbcab261ef2d5e498846cda4cdbd538103a7380 (patch) | |
| tree | ea9c369958dce1a89b3ebb0cac0aa9a4e289a26d /db_routines.php | |
| parent | 738228a8d838c5d7dadcfcee676a81baa0c43200 (diff) | |
| parent | 4ee15be98627dcc5e7de721a9fe69d3aabeefd41 (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
server_status.php
Diffstat (limited to 'db_routines.php')
| -rw-r--r-- | db_routines.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/db_routines.php b/db_routines.php index 0f7e2885f1..6d22335f64 100644 --- a/db_routines.php +++ b/db_routines.php @@ -25,6 +25,8 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'rte/common.js'; $GLOBALS['js_include'][] = 'rte/routines.js'; +$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; +$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; /** * Include all other files |