edan_f0

David Winterbottom 9e4258098f Merge branch 'master' into issue/764/partner-strategy Conflicts: oscar/models/fields.py oscar/templates/oscar/basket/partials/basket_content.html oscar/templates/oscar/dashboard/catalogue/product_list.html oscar/templates/oscar/partials/form_field.html oscar/test/factories.py		12 роки тому
..
migrations	Updated dependencies for south migrations	12 роки тому
__init__.py	Created new app for ranges	14 роки тому
app.py	Use settings-based dashboard nav	13 роки тому
forms.py	Range dashboard now works with multistockrecord	12 роки тому
models.py	Support Django's 1.5 AUTH_USER_MODEL feature	12 роки тому
views.py	Use HTML flash messages in ranges dashboard	13 роки тому