merge remote branch

This commit is contained in:
senderfm 2019-07-10 14:11:40 +02:00
commit 116ff124ed
3 changed files with 3 additions and 3 deletions

View File

@ -111,4 +111,4 @@
"prettier": "~1.18.2",
"supertest": "~4.0.2"
}
}
}

View File

@ -228,7 +228,7 @@ export default {
.main-container {
padding-top: 6rem;
padding-botton: 5rem;
padding-bottom: 5rem;
}
.main-navigation {

View File

@ -111,4 +111,4 @@
"vue-jest": "~3.0.4",
"vue-svg-loader": "~0.12.0"
}
}
}