diff options
| author |  Gareth Coles <[email protected]> | 2019-04-19 18:23:06 +0100 |
|---|---|---|
| committer | Gareth Coles <[email protected]> | 2019-04-19 18:23:06 +0100 |
| commit | 0cd78b638c48ac14c592398da0ed19f3e5ca2e2e (patch) | |
| tree | d74ebdf98537a6dd65dc926bcc3fed1458515c93 /manage.py | |
| parent | Char input has placeholder, finish dir listing (diff) | |
| parent | Revert linter to non-verbose. (diff) | |
Merge branch 'django' into django+200/wiki
# Conflicts:
# Pipfile.lock
# pydis_site/apps/home/tests.py
Diffstat (limited to 'manage.py')
0 files changed, 0 insertions, 0 deletions