diff options
| author |  Gareth Coles <[email protected]> | 2019-04-20 14:39:16 +0100 |
|---|---|---|
| committer | Gareth Coles <[email protected]> | 2019-04-20 14:39:16 +0100 |
| commit | 43039cd13afd19ea59addc3bb92c3c600826d8a3 (patch) | |
| tree | 1aaaf8b862a7b55836c6a64a16d2fc4cb4100e60 /pydis_site/__init__.py | |
| parent | Address reviews (diff) | |
| parent | Merge pull request #213 from python-discord/django_front_page (diff) | |
Merge branch 'django' into django+200/wiki
# Conflicts:
# Pipfile
# Pipfile.lock
# pydis_site/apps/home/tests/test_app_basics.py
# pydis_site/apps/home/urls.py
# pydis_site/hosts.py
# pydis_site/settings.py
Diffstat (limited to 'pydis_site/__init__.py')
0 files changed, 0 insertions, 0 deletions