Merge remote-tracking branch 'github/master'

Browse Source

# Conflicts:
#	CHANGELOG.md
#	src/frontend.template.php

...

This commit is contained in:

Synox 2018-01-19 23:28:41 +01:00

parent 2eeaaf3ddb bb938fc018

commit 4e08141bdf

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