edan_f0

David Winterbottom b7317e240c Merge branch 'datacash' Conflicts: oscar/apps/checkout/core_views.py oscar/apps/checkout/views.py oscar/apps/customer/views.py		14 лет назад
..
__init__.py	Added core and test packages	14 лет назад
decorators.py	Added core and test packages	14 лет назад
fields.py	Improved promotions package to allow arbitrary new types to be specified within a project	14 лет назад
loading.py	Fixed bug in new version of import_module	14 лет назад
tests.py	Moved core tests into correct folder	14 лет назад