The branch "kronolith_4_2" has been updated. The following is a summary of the commits.
from: 01265c44d127111faf8bc2f6963db43ff7c8119a 7370eda Don't compare this with an API that no longer exists. 59c4337 Fix saving display pref for resource calendars when toggling. 03441cb Merge branch 'master' into kronolith_4_2 Summary: http://github.com/horde/horde/compare/01265c44d127111faf8bc2f6963db43ff7c8119a...03441cbaf56b5fb42cc0768d987c810de24b15c2 ----------------------------------------------------------------------- commit 7370eda319a689840e45b5ae5c29c75e0c742ea8 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 28 01:21:06 2013 -0400 Don't compare this with an API that no longer exists. horde/config/conf.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/7370eda319a689840e45b5ae5c29c75e0c742ea8 http://git.horde.org/horde-git/-/commit/7370eda319a689840e45b5ae5c29c75e0c742ea8 ----------------------------------------------------------------------- commit 59c43372cc6c779da8ba324673e12351c6aecad2 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 28 22:33:26 2013 -0400 Fix saving display pref for resource calendars when toggling. kronolith/js/kronolith.js | 2 +- kronolith/lib/Calendar/Resource.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) http://github.com/horde/horde/commit/59c43372cc6c779da8ba324673e12351c6aecad2 http://git.horde.org/horde-git/-/commit/59c43372cc6c779da8ba324673e12351c6aecad2 ----------------------------------------------------------------------- commit 03441cbaf56b5fb42cc0768d987c810de24b15c2 Merge: 01265c4 59c4337 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 28 22:36:04 2013 -0400 Merge branch 'master' into kronolith_4_2 Conflicts: kronolith/lib/Calendar/Resource.php horde/config/conf.xml | 2 +- kronolith/js/kronolith.js | 2 +- kronolith/lib/Calendar/Resource.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) http://github.com/horde/horde/commit/03441cbaf56b5fb42cc0768d987c810de24b15c2 http://git.horde.org/horde-git/-/commit/03441cbaf56b5fb42cc0768d987c810de24b15c2 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
