Resolve merge conflict

This commit is contained in:
Saivann 2015-07-28 01:13:15 -04:00
commit 75a3c45628
65 changed files with 440 additions and 101 deletions

View file

@ -363,6 +363,10 @@ table td,table th{
display:block;
}
.breadcrumbs {
font-size: 75%;
padding-left: 10px;
}
.content{
position:relative;
padding:30px 40px 40px 40px;