The branch "master" has been updated. The following is a summary of the commits.
from: 006510c43e19a6340d44eae47135a5a4e76af204 f28d594 Merge changelogs. Summary: http://github.com/horde/horde/compare/006510c43e19a6340d44eae47135a5a4e76af204...f28d594cb8bc8e596bc1cd7e0ece5f6e22bf12bf ----------------------------------------------------------------------- commit f28d594cb8bc8e596bc1cd7e0ece5f6e22bf12bf Author: Jan Schneider <[email protected]> Date: Tue Jul 8 00:44:05 2014 +0200 Merge changelogs. Conflicts: bundles/groupware/docs/CHANGES bundles/groupware/package.xml bundles/webmail/docs/CHANGES bundles/webmail/package.xml bundles/groupware/docs/CHANGES | 1017 +++++++++++++++++++++++++++++++++++- bundles/groupware/package.xml | 41 ++- bundles/webmail/docs/CHANGES | 1148 +++++++++++++++++++++++++++++++++++++++- bundles/webmail/package.xml | 41 ++- horde/docs/CHANGES | 9 + horde/package.xml | 2 +- imp/package.xml | 2 +- ingo/package.xml | 2 +- kronolith/docs/CHANGES | 15 + kronolith/package.xml | 7 +- nag/docs/CHANGES | 8 + nag/package.xml | 3 +- turba/docs/CHANGES | 11 + turba/package.xml | 4 +- 14 files changed, 2298 insertions(+), 12 deletions(-) http://github.com/horde/horde/commit/f28d594cb8bc8e596bc1cd7e0ece5f6e22bf12bf -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
