diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
| commit | 5e1a9ad04d4e10ee44881a26ea72c9a80f748188 (patch) | |
| tree | 78b7f4287d00a2ff32cf6adf82c6289a5d3b6b95 /plugins/Facebook/facebookaction.php | |
| parent | 817f01c3b18ec626701de2a1402562eeb87eee6d (diff) | |
| parent | ee4ea3f3e1eb64df2dd3ba677f5201f8787482a8 (diff) | |
Merge branch 'testing'
Conflicts:
theme/base/css/display.css
Diffstat (limited to 'plugins/Facebook/facebookaction.php')
| -rw-r--r-- | plugins/Facebook/facebookaction.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index 815fee094..389e1ea81 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -89,7 +89,7 @@ class FacebookAction extends Action function showScripts() { - $this->script('js/facebookapp.js'); + $this->script('facebookapp.js'); } /** |