Skip to content
Browse files

Merge remote-tracking branch 'upstream/master' into custom_products

  • Loading branch information...
2 parents 4836b2b + 96e2384 commit e1bb0efca60df7a071494ea9a2b9f9b647da3597 @AlexHill committed Feb 5, 2013
Showing with 2 additions and 1 deletion.
  1. +1 −0 AUTHORS
  2. +1 −1 cartridge/shop/defaults.py
View
1 AUTHORS
@@ -24,3 +24,4 @@
* Kenneth Love
* Sachin Shende
* Evan Leis
+* Wojtek Ruszczewski
View
2 cartridge/shop/defaults.py
@@ -1,7 +1,7 @@
from socket import gethostname
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
from mezzanine.conf import register_setting

0 comments on commit e1bb0ef

Please sign in to comment.
Something went wrong with that request. Please try again.