[commits] Horde branch FRAMEWORK_5_2 updated. a68e34a243af485b44cc56bcecf761f5d9d8077b

[Michael M Slusarz]

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

from: 101fdd4e62941f645b7fa0f3283ef13d3696dddf

c8afa70 [mms] Fix accessing dynamic compose page when file uploads are not available (Bug #13580).
a68e34a Bug #13580: additional fix needed for FW_5_2

Summary: http://github.com/horde/horde/compare/101fdd4e62941f645b7fa0f3283ef13d3696dddf...a68e34a243af485b44cc56bcecf761f5d9d8077b

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

commit c8afa70a60082074e54f4339dc7b45bbd6786a17
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Sep 23 10:59:34 2014 -0600

    [mms] Fix accessing dynamic compose page when file uploads are not available (Bug #13580).
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/js/compose-dimp.js

 imp/docs/CHANGES       |    3 +++
 imp/js/compose-dimp.js |    8 +++++---
 imp/package.xml        |    2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/c8afa70a60082074e54f4339dc7b45bbd6786a17

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

commit a68e34a243af485b44cc56bcecf761f5d9d8077b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Sep 23 11:02:47 2014 -0600

    Bug #13580: additional fix needed for FW_5_2

 imp/js/compose-dimp.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/a68e34a243af485b44cc56bcecf761f5d9d8077b