aboutsummaryrefslogtreecommitdiffstats
path: root/view/php
diff options
context:
space:
mode:
authorMichael Meer <michael@meer.name>2014-01-27 10:37:15 +0100
committerMichael Meer <michael@meer.name>2014-01-27 10:37:15 +0100
commita3bf272753183f61723fea5dccd52abe6f0662dd (patch)
tree70a7e3a2e4ed5544abbddb8ee73226b638c01099 /view/php
parent844df110586e6726581c620754fef5419f6bea5e (diff)
parentd67fdd129921549b6a1e7cb5e5ebea7bdc38bf0e (diff)
downloadvolse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.tar.gz
volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.tar.bz2
volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.zip
Merge branch 'master' of https://github.com/MicMee/red
to be in sync
Diffstat (limited to 'view/php')
-rw-r--r--view/php/theme_init.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index a8edb0673..0e473f728 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -8,10 +8,8 @@ head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
head_add_css('library/tiptip/tipTip.css');
head_add_css('library/jgrowl/jquery.jgrowl.css');
head_add_css('library/jslider/css/jslider.css');
-head_add_css('library/prettyphoto/css/prettyPhoto.css');
head_add_css('library/colorbox/colorbox.css');
-// head_add_css('library/font_awesome/css/font-awesome.min.css');
head_add_css('view/css/conversation.css');
head_add_css('view/css/bootstrap-red.css');
head_add_css('view/css/widgets.css');
@@ -43,7 +41,6 @@ head_add_js('main.js');
head_add_js('crypto.js');
head_add_js('library/jslider/bin/jquery.slider.min.js');
head_add_js('docready.js');
-head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js');
head_add_js('library/colorbox/jquery.colorbox-min.js');
head_add_js('library/bootstrap-datetimepicker/js/moment.js');
head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');