Merge ../http

Conflicts:
	templates/mod/settings.html
This commit is contained in:
8chan 2014-10-08 18:21:38 -07:00
commit 162d9e8210

View File

@ -132,6 +132,7 @@
$config['additional_javascript'][] = 'js/id_highlighter.js';
$config['additional_javascript'][] = 'js/id_colors.js';
$config['additional_javascript'][] = 'js/inline.js';
$config['additional_javascript'][] = 'js/infinite-scroll.js';
$config['font_awesome_css'] = '/netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css';