Open das-g opened 3 years ago
@das-g Should I resolve the conflict in my branch and push?
@das-g Should I resolve the conflict in my branch and push?
That'd be great, @nikhiljohn10! If not, I'll do it when I get to it.
@das-g we need to fix https://github.com/DjangoGirls/tutorial/issues/1694 urgently before resolving this conflict i think.
Should we take the opportunity to just upgrade Python to 3.9.x?
Should we take the opportunity to just upgrade Python to 3.9.x?
That we can do independently of the switch to Django 3.1. Feel free to file a Pull Request towards the master
branch.
@das-g Once we merge #1731, I'll push the Python 3.9.5 PR for avoiding conflicts.
Django 3.1 requires the newer Python version(s), so merge the Python version changes from #1683 also into branch
django-3.1
.