Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	cogs/help.py

...

This commit is contained in:

Matthias Nadler committed 2019-06-29 20:31:50 +02:00

2 parents 888b66102a 93f161ddc9

commit a93b2f4a6e

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