Merge branch 'master' into 'develop'

# Conflicts: # login.php

Merge branch 'master' into 'develop'
# Conflicts: # login.php
9657fe17 · jlopez · f973a66a · a7e04db2 · 9657fe17
Commit 9657fe17 authored Jun 19, 2019 by jlopez
--- a/inc/css/style.css
+++ b/inc/css/style.css
@@ -70,6 +70,7 @@

 .badge {
    margin-right: 5px;
+    margin-top: 5px;
 }

 .btn-group > .btn:first-child {