[ciderwebmail] 01/08: Merge tag 'upstream/1.05+20150729'

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository ciderwebmail.

commit 2fc7f730593b0c035640fc4848f0fe821d469949
Merge: 66c7a11 e4516aa
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 3 16:10:59 2016 +0200

    Merge tag 'upstream/1.05+20150729'
    
    Upstream version 1.05+20150729
    
    # gpg: Underskrift lavet lør 03 sep 2016 16:10:55 CEST
    # gpg:                bruger RSA nøgle 2C7C3146C1A00121
    # gpg: God underskrift fra »Jonas Smedegaard <dr at jones.dk>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <js at debian.org>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <jonas at homebase.dk>« [ultimativ]
    # gpg:        også kendt som »[jpeg image of size 4165]« [ultimativ]

 lib/CiderWebmail.pm                 |   2 +-
 root/static/css/mail/new.css        | 114 +++++++++++++++++++++++++-----------
 root/static/scripts/base.js         |  14 ++---
 root/static/scripts/mail/compose.js |  14 ++---
 root/templates/base/compose.xml     |  58 ++++++++++--------
 5 files changed, 127 insertions(+), 75 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ciderwebmail.git