Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html

1 files changed, 2 insertions, 2 deletions

diff --git a/stylesheets/ferus.css b/stylesheets/ferus.css
index 5dbf11ed..f84d86ca 100644
--- a/stylesheets/ferus.css
+++ b/stylesheets/ferus.css
@@ -36,7 +36,7 @@ a.post_no:hover {
 }
 div.post.reply {
 	background: #0E0E0E;
-	border: #414141 2px solid;
+	border: #414141 2px solid !important;
 }
 .de-pview {
 		background: rgba(14, 14, 14, 0.84) !important;
@@ -147,4 +147,4 @@ div.ban h2 {
 table.modlog tr th {
 	background: #00FF00;
 	color: #AAAAAA;
-}
\ No newline at end of file
+}