[Pkg-owncloud-commits] [php-sabre-vobject] 19/38: Merge branch '3.3' of github.com:fruux/sabre-vobject into 3.3

[David Prévot]

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

taffit pushed a commit to branch upstream
in repository php-sabre-vobject.

commit 65924b9a861048564db76a6ff5cbcb853a45d412
Merge: 9086722 89d161b
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Tue Sep 16 18:25:30 2014 +0100

    Merge branch '3.3' of github.com:fruux/sabre-vobject into 3.3
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md                                 |  3 +++
 lib/ITip/Broker.php                          | 12 +++++++++---
 lib/ITip/Message.php                         | 18 ++++++------------
 tests/VObject/ITip/BrokerDeleteEventTest.php | 13 +++++++++----
 tests/VObject/ITip/BrokerUpdateEventTest.php | 13 +++++++++----
 tests/VObject/ITip/MessageTest.php           | 10 ++--------
 6 files changed, 38 insertions(+), 31 deletions(-)

diff --cc ChangeLog.md
index 81ed33e,2654b21..b3d2d7c
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -10,8 -10,8 +10,10 @@@ ChangeLo
  * #120: Support for `SCHEDULE-FORCE-SEND`.
  * #121: iCal demands parameters containing the + sign to be quoted.
  * #122: Don't generate REPLY messages for events that have been cancelled.
+ * #123: Added `SUMMARY` to iTip messages.
 +* #130: Incorrect validation rules for `RELATED` (should be `RELATED-TO`).
 +
+ 
  3.3.1 (2014-08-18)
  ------------------
  
@@@ -26,6 -26,6 +28,7 @@@
  * #115: Using REQUEST-STATUS from REPLY messages and now propegating that into
    SCHEDULE-STATUS.
  
++
  3.3.0 (2014-08-07)
  ------------------
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git