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

Browse Source

# Conflicts:
#	site/plugins/admin/lang/gl_ES.yaml
#	site/plugins/admin/lang/sv_SE.yaml

...

This commit is contained in:

Awilum

2020-04-08 20:02:35 +03:00

parent aea59f3d5e a02b412106

commit 1dce8bdf25

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