summaryrefslogtreecommitdiffstats
path: root/core/js/core.json
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-03-04 10:30:09 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-03-04 10:30:09 +0100
commitf507601e259da2e6b67237ffcfe8eeda880062ef (patch)
tree2b5b8ba182607904fc49bba235b639c141999d5b /core/js/core.json
parentaa11b83158ab70152a3804ef30281971e0a5a7c9 (diff)
parentc9272be0b9963eb358d0aa6e7b728d37e6caa7d6 (diff)
downloadnextcloud-server-f507601e259da2e6b67237ffcfe8eeda880062ef.tar.gz
nextcloud-server-f507601e259da2e6b67237ffcfe8eeda880062ef.zip
Merge pull request #14582 from rullzer/avatar_fixes
Avatars in share dialog fixes
Diffstat (limited to 'core/js/core.json')
-rw-r--r--core/js/core.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/js/core.json b/core/js/core.json
index b32ca5ca8f3..f57061a2c81 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -5,12 +5,14 @@
"jquery-ui/ui/jquery-ui.custom.js",
"underscore/underscore.js",
"moment/min/moment-with-locales.js",
- "handlebars/handlebars.js"
+ "handlebars/handlebars.js",
+ "blueimp-md5/js/md5.js"
],
"libraries": [
"jquery-showpassword.js",
"jquery-tipsy.js",
- "jquery.avatar.js"
+ "jquery.avatar.js",
+ "placeholder.js"
],
"modules": [
"compatibility.js",