Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-03-29 16:11:50 -07:00
parent ad3a327366 3b6a0d8e5c
commit 2d4f84563b
9 changed files with 80 additions and 25 deletions
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -33,7 +33,6 @@ nav .badge {
 	padding: 0.2rem 0;
 }

-
 #navbar-collapse-1 i {
 	font-size: 0.9rem;
 }