Merge branch '1.2.x'

This commit is contained in:
Antoine Nguyen
2015-03-12 16:29:32 +01:00
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -50,7 +50,7 @@ copyright = u'2014, Antoine Nguyen'
# The short X.Y version.
version = '1.2'
# The full version, including alpha/beta/rc tags.
release = '1.2.0'
release = '1.2.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
+2 -1
View File
@@ -200,7 +200,8 @@ class Alias(AdminObject):
except Mailbox.DoesNotExist:
raise BadRequest(_("Local recipient %s not found" % rcpt))
int_rcpts += [target]
self.save(int_rcpts=int_rcpts, ext_rcpts=ext_rcpts, creator=user)
self.save(int_rcpts=int_rcpts, ext_rcpts=ext_rcpts)
self.post_create(user)
def to_csv(self, csvwriter):
row = [self.type, self.full_address.encode("utf-8"), self.enabled]
+1 -1
View File
@@ -54,7 +54,7 @@ def read(fname):
setup(
name="modoboa",
version='1.2.0',
version='1.2.1',
url='http://modoboa.org/',
license='MIT',
description="Mail hosting made simple",