aboutsummaryrefslogtreecommitdiffstats
path: root/view/php/theme_init.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-06 02:37:06 -0800
committerfriendica <info@friendica.com>2014-01-06 02:37:06 -0800
commit196b3022bd8759428d04d8d3bcf10c27d7c3b329 (patch)
treeba785f204e8616af5751d7303d3357c75b9d30bc /view/php/theme_init.php
parent0c85c9748096d625ae9baa29fb9aad48bab3a208 (diff)
parentae8a30273a6b787985d06fa776d1726d4427f9be (diff)
downloadvolse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.gz
volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.bz2
volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.zip
Merge branch 'master' into movejs
Conflicts: version.inc
Diffstat (limited to 'view/php/theme_init.php')
-rw-r--r--view/php/theme_init.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index da50144dc..a8edb0673 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -25,7 +25,7 @@ head_add_js('jquery-migrate-1.1.1.js');
head_add_js('spin.js');
head_add_js('jquery.spin.js');
head_add_js('jquery.textinputs.js');
-head_add_js('fk.autocomplete.js');
+head_add_js('autocomplete.js');
head_add_js('library/fancybox/jquery.fancybox-1.3.4.js');
head_add_js('library/jquery.timeago.js');
head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js');