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

Browse source

# Conflicts:
#	rcgcdw.py
#	settings.json.example

...

This commit is contained in:

Frisk 2018-11-11 22:48:39 +01:00

parent ba599ac83b 3e031c9330

commit 4dc8f2d8e2

No known key found for this signature in database

GPG key ID: 0E9A7D3C0A01586C

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