Merge remote-tracking branch 'origin/CAKE-284-add-support-to-the-main-menu' into CAKE-284-add-support-to-the-main-menu

Browse source

# Conflicts:
#	lib/view_model/settings/settings_view_model.dart

...

This commit is contained in:

OleksandrSobol 2021-03-01 20:18:14 +02:00

parent 6245dfe885 99cb00f0bd

commit 4d50970fc9

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

Diff content is not available