Merge remote-tracking branch 'origin/develop' into develop

Browse Source

# Conflicts:
#	src/sass/parts/main-block.scss

...

This commit is contained in:

Sergey Krylov 2021-04-04 22:47:12 +03:00

parent 6cb31a02cc d3dc2e8ae0

commit 611ea4464b

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files