Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # src/sass/parts/main-block.scss
This commit is contained in:
commit
611ea4464b
@ -47,4 +47,4 @@
|
|||||||
.main {
|
.main {
|
||||||
height: 250px !important;
|
height: 250px !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user