Merge remote-tracking branch 'origin/release/v1.9.6' into release/v1.9.6

Browse Source

# Conflicts:
#	static/src/assets/i18n/statistics/en.json

release/v1.9.6

HardiReady 2019-10-11 20:16:27 +02:00

parent 02d6d1b895 920aa2201d

commit 15ca881b0c

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 Not Available