edan_f0

履歴

Maik Hoepfel c46ff56049 Merge branch 'master' into issue/1093/search Conflicts: oscar/apps/dashboard/catalogue/views.py oscar/apps/search/facets.py tests/functional/catalogue/catalogue_tests.py		11年前
..
howto	Merge branch 'master' into issue/1093/search	11年前
internals	Document changes regarding migrations	11年前
ref	Drop OSCAR_OFFER_BLACKLIST_PRODUCT functionality	11年前
releases	Merge branch 'master' into issue/1093/search	11年前
topics	Try to prevent circular import issues	11年前
conf.py	Revert to using sandbox settings (but without debug toolbar)	11年前
index.rst	Rename a few more tests and comments	11年前