ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-20 11:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

change

Browse Source
This commit is contained in:
Alexander Friedland 2019-07-10 19:10:49 +02:00 committed by GitHub
parent 1fa4e75b07
commit 1870881aa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/layouts/default.vue
View File

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