Conflicts: docs/source/releases/index.rst oscar/__init__.py oscar/apps/customer/wishlists/views.py oscar/apps/dashboard/catalogue/views.py oscar/apps/offer/receivers.py oscar/apps/order/abstract_models.py oscar/templates/oscar/basket/partials/basket_totals.html oscar/templates/oscar/catalogue/detail.html oscar/templates/oscar/customer/order/order_detail.html oscar/templates/oscar/customer/wishlists/wishlists_delete_product.html