The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: 0d0b2c358e776809a6ceb5e8ae6fa104a4fa7dad 15b9373 [mms] Fix regression in displaying user-defined virtual folders in folder listings. 4a12b24 config docs 601a6ad Bug #12065: Don't do isInvsible() check if checking whether current element has active children a929a55 Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 15b93735470f361d56c4f6ed3b9c01dd4ed432c1 Author: Michael M Slusarz <[email protected]> Date: Sat Feb 23 19:10:31 2013 -0700 [mms] Fix regression in displaying user-defined virtual folders in folder listings. imp/docs/CHANGES | 2 ++ imp/lib/Imap/Tree.php | 4 ++-- imp/package.xml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/15b93735470f361d56c4f6ed3b9c01dd4ed432c1 ----------------------------------------------------------------------- commit 4a12b24f755cdcd3acb6010a27692fc593330a19 Author: Michael M Slusarz <[email protected]> Date: Sat Feb 23 21:58:10 2013 -0700 config docs imp/config/backends.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/4a12b24f755cdcd3acb6010a27692fc593330a19 ----------------------------------------------------------------------- commit 601a6ad6426c76e9d6e173c85bd5cd0a04f98e41 Author: Michael M Slusarz <[email protected]> Date: Sat Feb 23 22:48:54 2013 -0700 Bug #12065: Don't do isInvsible() check if checking whether current element has active children imp/lib/Imap/Tree.php | 105 ++++++++++++++++++++++++++---------------------- 1 files changed, 57 insertions(+), 48 deletions(-) http://git.horde.org/horde-git/-/commit/601a6ad6426c76e9d6e173c85bd5cd0a04f98e41 ----------------------------------------------------------------------- commit a929a55a69445f998c93a10c9d54ad74fb59ae09 Merge: 4a12b24 601a6ad Author: Michael M Slusarz <[email protected]> Date: Sat Feb 23 22:53:19 2013 -0700 Merge branch 'master' into imp_6_1 Conflicts: imp/docs/CHANGES imp/lib/Imap/Tree.php imp/package.xml imp/docs/CHANGES | 2 + imp/lib/Imap/Tree.php | 99 +++++++++++++++++++++++++----------------------- imp/package.xml | 1 + 3 files changed, 55 insertions(+), 47 deletions(-) http://git.horde.org/horde-git/-/commit/a929a55a69445f998c93a10c9d54ad74fb59ae09 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
