Matt Westcott c21800b7b0 Merge branch 'inline-panel-min-max' of https://github.com/kaedroho/wagtail into kaedroho-inline-panel-min-max ... Conflicts: wagtail/wagtailadmin/edit_handlers.py		2015-10-09 15:42:54 +01:00
..
contrib	Normalise all code blocks in the docs	2015-10-05 16:55:58 +01:00
pages	Merge branch 'inline-panel-min-max' of https://github.com/kaedroho/wagtail into kaedroho-inline-panel-min-max	2015-10-09 15:42:54 +01:00
hooks.rst	…
index.rst	…
management_commands.rst	Normalise all code blocks in the docs	2015-10-05 16:55:58 +01:00
project_template.rst	Normalise all code blocks in the docs	2015-10-05 16:55:58 +01:00