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

[David Prévot]

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

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

commit 88d1307ea2e2da2620dfba4c300e1da9917c874d
Merge: 6258ae9 987560a
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jun 2 17:33:02 2014 -0400

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

 ChangeLog.md                                |  3 ++
 lib/Sabre/VObject/Component/VTodo.php       | 53 ++++++++++++++++++++++++++
 tests/Sabre/VObject/Component/VTodoTest.php | 59 +++++++++++++++++++++++++++++
 3 files changed, 115 insertions(+)

diff --cc ChangeLog.md
index c2f7845,935d96f..d085146
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -4,12 -4,12 +4,15 @@@ ChangeLo
  3.2.3 (2014-??-??)
  ------------------
  
+ * Validator now checks if DUE and DTSTART are of the same type in VTODO, and
+   ensures that DUE is always after DTSTART.
 +* Removed documentation from source repository, to http://sabre.io/vobject/
 +
  
+ 
  3.2.2 (2014-05-07)
  ------------------
 +
  * Minor tweak in unittests to make it run on PHP 5.5.12. Json-prettifying
    slightly changed which caused the test to fail.
  

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