Merge remote-tracking branch 'origin/master'

This commit is contained in:
FezVrasta 2014-09-30 10:08:29 +02:00
commit b8d0ac5358

View File

@ -19,6 +19,8 @@
.navbar-text { .navbar-text {
color: @navbar-color; color: @navbar-color;
margin-top: 20px;
margin-bottom: 20px;
} }
.navbar-nav { .navbar-nav {