Permalink
Checking mergeability…
Don’t worry, you can still create the pull request.
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
...
- 3 commits
- 6 files changed
- 1 contributor
Commits on Sep 24, 2018
Commits on Jan 30, 2020
-
Merge branch 'master' into mk/tree-editor-rebuild
* master: (41 commits) FeinCMS v1.18.0 Drop Django 1.7 on the floor because it complains about the ugettext->gettext change Replace ugettext* with gettext* _We_ don't need the newer version, but the Django 1.8 test does Add initial migrations for the test suite Fix tests locally Add a style checking job Add Django 3.0 to the matrix Prefer importing FieldDoesNotExist from its new location (since Django 1.8) Add Django 2.2 to the build One more FeinCMS v1.17.0 Revert "Replace ugettext with gettext" Replace ugettext with gettext Replace curry with functools.partial Stop depending on django.utils.six and python_2_unicode_compatible Fix simple typo: suported -> supported FeinCMS v1.16.4 FeinCMS v1.16.3 Support passing kwargs to django-reversion ...
-
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff main...mk/tree-editor-rebuild