diff options
author | friendica <info@friendica.com> | 2013-12-11 15:32:25 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-12-11 15:32:25 -0800 |
commit | c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05 (patch) | |
tree | cc9eef5ea3c6676cd537f2f89776ab6d3c835db1 /view/php/theme_init.php | |
parent | 2c02f57f276658269a6cc2031fb0fc9ac0a9077c (diff) | |
parent | 06c81e189f031a74c54aa14b1f29c93379e7cf3c (diff) | |
download | volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.tar.gz volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.tar.bz2 volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.zip |
Merge https://github.com/friendica/red into zpull
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'view/php/theme_init.php')
-rw-r--r-- | view/php/theme_init.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index a2024d658..e1625b3e5 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -13,6 +13,7 @@ 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'); head_add_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); |