Merge remote-tracking branch 'origin/stable'

Browse Source

# Conflicts:
#	src/public/app/layouts/mobile_layout.js

...

This commit is contained in:

zadam

2021-03-20 12:49:37 +01:00

parent b79d81a94d bff04c121a

commit 135b4fe88e

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

Diff Content Not Available