diff options
author | Florian Pritz <bluewind@xinu.at> | 2015-08-02 17:07:02 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2015-08-02 17:07:02 +0200 |
commit | 3fa8f8acc3c366c86765b76e4cf8cc2cf5916c5c (patch) | |
tree | 197c5a70f1a09b52b1355296cee1b1540287d72d /public_html/data/js/main.js | |
parent | 81202ecf82132e3294141a49c9dddd1f5b852c04 (diff) | |
parent | 07cc0d00f670fd94d7aa0e23953d177036ded4e8 (diff) |
Merge branch 'add-range-selection' into dev
Diffstat (limited to 'public_html/data/js/main.js')
-rw-r--r-- | public_html/data/js/main.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/public_html/data/js/main.js b/public_html/data/js/main.js index 5710dcb68..482981fc7 100644 --- a/public_html/data/js/main.js +++ b/public_html/data/js/main.js @@ -6,7 +6,8 @@ requirejs.config({ 'bootstrap': ['jquery'], 'jquery.tablesorter': ['jquery'], 'jquery.lazyload': ['jquery'], - 'jquery.colorbox': ['jquery'] + 'jquery.colorbox': ['jquery'], + 'jquery.checkboxes': ['jquery'] }, paths: { 'jquery': 'vendor/jquery-2.0.3.min', @@ -15,6 +16,7 @@ requirejs.config({ 'jquery.tablesorter': 'vendor/jquery.tablesorter.min', 'jquery.lazyload': 'vendor/jquery.lazyload', 'jquery.colorbox': 'vendor/jquery.colorbox', + 'jquery.checkboxes': 'vendor/jquery.checkboxes-1.0.6.min', 'underscore': 'vendor/underscore' } }); |