diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-07 17:10:45 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-07 17:10:45 +0200 |
| commit | 78e5410199559c37efff0c0d6851fd1555a39beb (patch) | |
| tree | bb240eb277fc987ad19719b7e49e018262bf29d1 /lib/base.php | |
| parent | d7bc23e16d54ea1f3c24fc9ec2297f6dcd7d856b (diff) | |
| parent | 1e559f72391b51089674e68871bf2502a5e5c75e (diff) | |
| download | nextcloud-server-78e5410199559c37efff0c0d6851fd1555a39beb.tar.gz nextcloud-server-78e5410199559c37efff0c0d6851fd1555a39beb.zip | |
Merge branch 'master' into jshint-globals-oc-t-n
Conflicts:
.jshintrc
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index 15a3ec8bc8a..6ea77aa7a58 100644 --- a/lib/base.php +++ b/lib/base.php @@ -305,6 +305,7 @@ class OC { OC_Util::addScript("jquery.placeholder"); OC_Util::addScript("jquery-tipsy"); OC_Util::addScript("compatibility"); + OC_Util::addScript("underscore"); OC_Util::addScript("jquery.ocdialog"); OC_Util::addScript("oc-dialogs"); OC_Util::addScript("js"); |