Commit graph

3 commits

Author SHA1 Message Date
Karl Hobley
b566b72736 Merge remote-tracking branch 'torchbox/master' into image-frontend-urls
Conflicts:
	docs/core_components/images/index.rst
	wagtail/wagtailimages/models.py
	wagtail/wagtailimages/tests.py
	wagtail/wagtailimages/utils/validators.py
2014-07-30 09:47:59 +01:00
Karl Hobley
d515029359 Moved frontend image url docs into new images section 2014-07-29 16:35:34 +01:00
Karl Hobley
56acdb2bd7 Moved image feature detection docs into new images section 2014-07-29 13:13:39 +01:00