From 2953cc8497a058f1524e84bda7953000bd0dc1a0 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Tue, 17 May 2011 15:06:21 -0700
Subject: [PATCH] Move infinite scroll out of vendor, because it has been
 edited

---
 config/assets.yml                                               | 2 +-
 ...jquery.infinitescroll.js => jquery.infinitescroll-custom.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename public/javascripts/{vendor/jquery.infinitescroll.js => jquery.infinitescroll-custom.js} (100%)

diff --git a/config/assets.yml b/config/assets.yml
index 53c8f1d9f1..c53afdcf64 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -15,11 +15,11 @@ javascripts:
     - public/javascripts/vendor/jquery.hotkeys.js
     - public/javascripts/vendor/jquery.autoresize.min.js
     - public/javascripts/vendor/jquery-ui-1.8.9.custom.min.js
-    - public/javascripts/vendor/jquery.infinitescroll.js
     - public/javascripts/vendor/facebox.js
     - public/javascripts/vendor/timeago.js
     - public/javascripts/vendor/Mustache.js
     - public/javascripts/vendor/charCount.js
+    - public/javascripts/jquery.infinitescroll-custom.js
     - public/javascripts/jquery.autocomplete-custom.js
     - public/javascripts/jquery.infieldlabel-custom.js
     - public/javascripts/keycodes.js
diff --git a/public/javascripts/vendor/jquery.infinitescroll.js b/public/javascripts/jquery.infinitescroll-custom.js
similarity index 100%
rename from public/javascripts/vendor/jquery.infinitescroll.js
rename to public/javascripts/jquery.infinitescroll-custom.js
-- 
GitLab