Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJonne Haß <me@jhass.eu>2014-10-07 16:40:47 +0400
committerJonne Haß <me@jhass.eu>2014-10-07 16:40:47 +0400
commit518186a5381d682a5bb4eb559da5e4558849234f (patch)
tree1c5f01293ebac62a1066b02c08151d666d2db750 /app
parentea2a1f0ec9ce0872ff215230c5acb201e99a9187 (diff)
parenteb916f2690c266b8b0669acc1b1e769678612ae8 (diff)
Merge pull request #5299 from strivedi183/5194-replace_jqueryplaceholderjs_vendored_asset_with_bower_package
Replaced jquery.placeholder.js vendored asset with bower package and updated to latest version #5194
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index a0d61d8bd..b0ae002b8 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -10,7 +10,7 @@
//= require jquery.remotipart
//= require jquery.autoresize
//= require jquery.charcount
-//= require jquery.placeholder
+//= require jquery-placeholder
//= require rails-timeago
//= require facebox
//= require browser_detection