Matthias Nadler 0e6a797d46 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	cogs/help.py

2019-06-29 20:37:18 +02:00

..

__init__.py

Initial commit

2019-02-08 16:26:11 +01:00

admin.py

most of work for 2.4 done

2019-06-18 18:10:52 +02:00

config.py

Migration to rewrite

2019-04-12 20:30:36 +02:00

db_api.py

most of work for 2.4 done

2019-06-18 18:10:52 +02:00

help.py

Merge remote-tracking branch 'origin/master'

2019-06-29 20:37:18 +02:00

poll_controls.py

typo

2019-06-19 20:41:10 +02:00