mirror of
https://github.com/wagtail/wagtail.git
synced 2024-11-25 13:10:14 +01:00
1ecf48fb3f
Conflicts: docs/advanced_topics/settings.rst docs/getting_started/integrating_into_django.rst docs/topics/pages.rst docs/topics/snippets.rst gulpfile.js/config.js wagtail/contrib/wagtailstyleguide/views.py wagtail/project_template/project_name/settings/base.py wagtail/snippets/tests.py wagtail/snippets/views/chooser.py wagtail/snippets/views/snippets.py wagtail/snippets/wagtail_hooks.py wagtail/tests/settings.py wagtail/tests/snippets/models.py wagtail/tests/testapp/models.py |
||
---|---|---|
.. | ||
demo_site.rst | ||
index.rst | ||
integrating_into_django.rst | ||
the_zen_of_wagtail.rst | ||
tutorial.rst |