[commits] Horde branch FRAMEWORK_5_2 updated. 02c3b97ab6441b05f385265bc65ff45a59b9c5f3

Thu Jan 8 00:15:14 UTC 2015

The branch "FRAMEWORK_5_2" has been updated.
The following is a summary of the commits.

from: 9ff0193119a349f1e9d3c225ed7b1ea9a94d9d21

02c3b97 Fix contacts popup translation

Summary: http://github.com/horde/horde/compare/9ff0193119a349f1e9d3c225ed7b1ea9a94d9d21...02c3b97ab6441b05f385265bc65ff45a59b9c5f3

-----------------------------------------------------------------------

commit 02c3b97ab6441b05f385265bc65ff45a59b9c5f3
Author: JoÃ£o Machado <geral at jpaulo.eu>
Date:   Wed Jan 7 15:42:09 2015 +0000

    Fix contacts popup translation

    Signed-off-by: Michael M Slusarz <slusarz at horde.org>

    Conflicts:
    	imp/js/contacts.js

 imp/js/contacts.js         |    2 +-
 imp/lib/Basic/Contacts.php |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/02c3b97ab6441b05f385265bc65ff45a59b9c5f3