Commit 9657fe17 authored by jlopez's avatar jlopez
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   login.php
parents f973a66a a7e04db2
......@@ -70,6 +70,7 @@
.badge {
margin-right: 5px;
margin-top: 5px;
}
.btn-group > .btn:first-child {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment