[commits] Horde branch master updated. 05e833169a98d1c6df719a1a8865b810384bc56a

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: cf315723c4831cf4b7f94714596fe550f56ecab0

2030704 spelling
1a61808 Force iTip attachments to be displayed inline. Only show conflicts if sending events, i.e. not in attendee responses etc.
05e8331 Show attendee status.

-----------------------------------------------------------------------

commit 20307041a3224d1604f3dba3a927fbe3f0b3c9ae
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jun 3 15:32:08 2010 +0200

    spelling

 imp/lib/Mime/Viewer/Itip.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Itip.php?rt=horde-git&r1=bf4719ffd4d666e00287a27dc1f42085a36ccb0e&r2=20307041a3224d1604f3dba3a927fbe3f0b3c9ae

-----------------------------------------------------------------------

commit 1a61808f3fb6881144106806a21e9532c25775ae
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jun 3 15:50:14 2010 +0200

    Force iTip attachments to be displayed inline.
    Only show conflicts if sending events, i.e. not in attendee responses etc.

 imp/lib/Mime/Viewer/Itip.php |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Itip.php?rt=horde-git&r1=20307041a3224d1604f3dba3a927fbe3f0b3c9ae&r2=1a61808f3fb6881144106806a21e9532c25775ae

-----------------------------------------------------------------------

commit 05e833169a98d1c6df719a1a8865b810384bc56a
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jun 3 17:05:37 2010 +0200

    Show attendee status.

 kronolith/js/kronolith.js   |   13 +++++++++++--
 kronolith/themes/screen.css |   10 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=efde4a0fb4b9a1d01eac9fa29c893df691347882&r2=05e833169a98d1c6df719a1a8865b810384bc56a
http://git.horde.org/diff.php/kronolith/themes/screen.css?rt=horde-git&r1=f4cced6c93b7ef2bef3dab240c1234fe7df71e23&r2=05e833169a98d1c6df719a1a8865b810384bc56a