Merge branch 'master' into task/3713/clean_up_css

This commit is contained in:
Arvind Tiwari 2018-02-08 17:11:41 +05:30
commit b9c53717e3
29 changed files with 119 additions and 427 deletions

View file

@ -25,7 +25,7 @@ class BaseEmail(object):
self.email.from_email = kwargs.get('from_address')
else:
self.email.from_email = '(ungleich) ungleich Support <info@ungleich.ch>'
self.email.to = [kwargs.get('to', 'info@ungleich.com')]
self.email.to = [kwargs.get('to', 'info@ungleich.ch')]
def send(self):
self.email.send()

View file

@ -44,7 +44,7 @@ class BaseTestCase(TestCase):
# Request Object
self.request = HttpRequest()
self.request.META['SERVER_NAME'] = 'ungleich.com'
self.request.META['SERVER_NAME'] = 'ungleich.ch'
self.request.META['SERVER_PORT'] = '80'
def get_client(self, user):