[commits] Horde branch master updated. 4b48a536a32d4139ecde56aa774c15a9d43033ae

[Jan Schneider]

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

from: ba4a96694a9d133b72bc6c0b552dd5f86317307b

4b48a53 Make sure that timeobjects show up in the configuration screen.

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

commit 4b48a536a32d4139ecde56aa774c15a9d43033ae
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jun 19 11:27:06 2013 +0200

    Make sure that timeobjects show up in the configuration screen.
    
    We already had an empty conf.php there, but that wasn't bundled because it's on
    the blacklist. Add a placeholder in config/ instead.
    
    Bug: 12365

 timeobjects/config/conf.php |    4 ----
 timeobjects/docs/CHANGES    |    1 +
 timeobjects/package.xml     |   20 +++++++++++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 timeobjects/config/.keep
 delete mode 100644 timeobjects/config/conf.php

http://git.horde.org/horde-git/-/commit/4b48a536a32d4139ecde56aa774c15a9d43033ae