The branch "master" has been updated. The following is a summary of the commits.
from: 919709edbb319f70b10e07247c986f5caaf9c40f ee4e1c5 This needs to be 2.1.0. ab944cb [rla] Add support for external links in topbar (Feature #11977). ----------------------------------------------------------------------- commit ee4e1c567a599833642e1a0a9e7e529084760e22 Author: Jan Schneider <[email protected]> Date: Wed Aug 28 12:49:15 2013 +0200 This needs to be 2.1.0. framework/Auth/package.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/ee4e1c567a599833642e1a0a9e7e529084760e22 ----------------------------------------------------------------------- commit ab944cb25976f3f86505694280bafc55e652417b Author: Ralf Lang <[email protected]> Date: Mon Jun 24 12:57:04 2013 +0300 [rla] Add support for external links in topbar (Feature #11977). Conflicts: framework/Core/package.xml framework/Core/lib/Horde/Core/Topbar.php | 3 ++- framework/Core/lib/Horde/Registry.php | 3 ++- framework/Core/package.xml | 16 +++++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) http://git.horde.org/horde-git/-/commit/ab944cb25976f3f86505694280bafc55e652417b -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
