Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

Browse Source

# Conflicts:
#	composer.json
#	css/light-grey.scss
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php

...

This commit is contained in:

Molkobain

2020-09-08 17:30:32 +02:00

parent 46fe1661db b5cfd1c61e

commit 8193ada159

144 changed files with 19950 additions and 1687 deletions

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

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

BIN

images/bg.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 64 B

BIN

images/desc.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 54 B