diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
commit | 49bce941a9aae495ee7221bd367791227487b458 (patch) | |
tree | 91858ee586473045158f6bb539e26af8168ecd84 /plugins/InfiniteScroll/InfiniteScrollPlugin.php | |
parent | 3d30ad83f881a69d76b57a9af051fef308644987 (diff) | |
parent | 5323956e388ebc2e4dfa1a5193aa670c96fff027 (diff) |
Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/requesttoken.php
classes/File.php
install.php
lib/action.php
lib/noticeform.php
Diffstat (limited to 'plugins/InfiniteScroll/InfiniteScrollPlugin.php')
-rw-r--r-- | plugins/InfiniteScroll/InfiniteScrollPlugin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php index c955298cb..5928c007f 100644 --- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php +++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php @@ -40,7 +40,7 @@ class InfiniteScrollPlugin extends Plugin function onEndShowScripts($action) { - $action->script('plugins/InfiniteScroll/jquery.infinitescroll.min.js'); + $action->script('plugins/InfiniteScroll/jquery.infinitescroll.js'); $action->script('plugins/InfiniteScroll/infinitescroll.js'); } } |