The branch "master" has been updated. The following is a summary of the commits.
from: 62b7b3835cb3ac1e86f92322cde9cd83343e277d bfc7cfd Per MS-ASCMD 2.2.3.34, DELETE never conflicts - it always takes precedence. 1629c3e Update the state after the messages are deleted. 8efcc05 Use ::getSyncStamp() for consistency. ----------------------------------------------------------------------- commit bfc7cfd8680ceef77a54fc7ebfef5a8f06eef0f5 Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 17:44:40 2013 -0400 Per MS-ASCMD 2.2.3.34, DELETE never conflicts - it always takes precedence. Bug: 12523 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 14 ------ 1 files changed, 0 insertions(+), 14 deletions(-) http://git.horde.org/horde-git/-/commit/bfc7cfd8680ceef77a54fc7ebfef5a8f06eef0f5 ----------------------------------------------------------------------- commit 1629c3e418494acd743116585c51f5deb345655d Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 17:56:15 2013 -0400 Update the state after the messages are deleted. Bug: 12523 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 16 ++---- 1 files changed, 6 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/1629c3e418494acd743116585c51f5deb345655d ----------------------------------------------------------------------- commit 8efcc05926bb91f2be798e0151402537964a7558 Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 17:56:59 2013 -0400 Use ::getSyncStamp() for consistency. Bug: 12523 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/8efcc05926bb91f2be798e0151402537964a7558 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
