[commits] Horde branch master updated. 481c69bdd1e1b05d8db70b6206d6d2836a7c569d

[Jan Schneider]

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

from: 12b0b389efc81d525ca0d0da8b4a4b4b4bab3d5a

370796b Escape correctly.
2f0a14b Use json_encode() to build composer.json.
481c69b Make this pass the PHP 5 linter.

Summary: http://github.com/horde/horde/compare/12b0b389efc81d525ca0d0da8b4a4b4b4bab3d5a...481c69bdd1e1b05d8db70b6206d6d2836a7c569d

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

commit 370796b511ce21eb0b91c0a3d540b4f9a2172fd6
Author: Jan Schneider <jan at horde.org>
Date:   Wed Apr 19 21:52:05 2017 +0200

    Escape correctly.

 framework/Stringprep/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

http://github.com/horde/horde/commit/370796b511ce21eb0b91c0a3d540b4f9a2172fd6

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

commit 2f0a14bfd89e2d55701aaf5bb8007eaddf68fdb3
Author: Jan Schneider <jan at horde.org>
Date:   Wed Apr 19 22:22:11 2017 +0200

    Use json_encode() to build composer.json.

 components/lib/Conductor/Package2XmlToComposer.php | 132 ++++++---------------
 components/package.xml                             |   2 +-
 2 files changed, 38 insertions(+), 96 deletions(-)

http://github.com/horde/horde/commit/2f0a14bfd89e2d55701aaf5bb8007eaddf68fdb3

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

commit 481c69bdd1e1b05d8db70b6206d6d2836a7c569d
Author: Jan Schneider <jan at horde.org>
Date:   Wed Apr 19 22:25:24 2017 +0200

    Make this pass the PHP 5 linter.

 components/lib/Conductor/Package2XmlToComposer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

http://github.com/horde/horde/commit/481c69bdd1e1b05d8db70b6206d6d2836a7c569d