Merge branch 'master' of ssh://git.cy55.de/home/git/cybertools
This commit is contained in:
commit
17e86e64c7
3 changed files with 4 additions and 5 deletions
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2011 Helmut Merz helmutm@cy55.de
|
||||
# Copyright (c) 2013 Helmut Merz helmutm@cy55.de
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
@ -366,3 +366,4 @@ class IFormManager(IClientManager):
|
|||
description=_(u'Email address that will be used as sender '
|
||||
'address of confirmation and feedback messages.'),
|
||||
required=False,)
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ Working with MHT Files.
|
|||
import base64
|
||||
from cStringIO import StringIO
|
||||
import email
|
||||
import Image
|
||||
from PIL import Image
|
||||
import mimetypes
|
||||
import os
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2007 Helmut Merz helmutm@cy55.de
|
||||
# Copyright (c) 2013 Helmut Merz helmutm@cy55.de
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
@ -18,8 +18,6 @@
|
|||
|
||||
"""
|
||||
State definition implementation.
|
||||
|
||||
$Id$
|
||||
"""
|
||||
|
||||
from zope.interface import implements
|
||||
|
|
Loading…
Add table
Reference in a new issue