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

2017-07-02 18:58:43 -07:00
parent 64cad0a041 133292e241
commit 48063fa5ef
27 changed files with 2429 additions and 4407 deletions
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -66,10 +66,6 @@ nav .dropdown-menu {
 }
 /* nav overrides end */

-.btn-outline-secondary {
-	color: #aaa;
-}
-
 .wall-item-tools .dropdown-menu {
 	min-width: auto;
 }