diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-28 14:54:10 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-28 14:54:10 +0100 |
| commit | 15d1df055b093ecce0c5ae52561dd73584145c7c (patch) | |
| tree | 4f2b10bacfa5371e3f2a53122a3165bf94114d01 /core/js/tests | |
| parent | 65843e245996c9ecfd167be2b520bb917b32aa7e (diff) | |
| parent | dd32091016481b0b6845e03ea87ce419b3cda19e (diff) | |
| download | nextcloud-server-15d1df055b093ecce0c5ae52561dd73584145c7c.tar.gz nextcloud-server-15d1df055b093ecce0c5ae52561dd73584145c7c.zip | |
Merge branch 'master' into display-share-owner-master
Conflicts:
apps/files_sharing/lib/cache.php
Diffstat (limited to 'core/js/tests')
| -rw-r--r-- | core/js/tests/specHelper.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js index 1848d08354e..b1193240580 100644 --- a/core/js/tests/specHelper.js +++ b/core/js/tests/specHelper.js @@ -63,6 +63,7 @@ window.oc_config = { session_lifetime: 600 * 1000, session_keepalive: false }; +window.oc_defaults = {}; // global setup for all tests (function setupTests() { |