IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge origin

Browse Source
This commit is contained in:
senderfm 2019-07-10 17:26:02 +02:00
commit 1fa4e75b07
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/layouts/default.vue
View File

@ -228,7 +228,11 @@ export default {
.main-container {
padding-top: 6rem;
<<<<<<< HEAD
padding-bottom: 5rem;
=======
padding-botton: 5rem;
>>>>>>> 4dfb16cb7cda8291370749a058ce85750364abfd
}
.main-navigation {