[Pkg-owncloud-commits] [owncloud] 03/44: Merge pull request #7394 from owncloud/backport-7344

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit c30377392b0ab0b6fdb2068bcbfe0fe0dea4c3de
Merge: 149814d 0d2482a
Author: Owen Winkler <a_github at midnightcircus.com>
Date:   Tue Feb 25 10:37:33 2014 -0500

    Merge pull request #7394 from owncloud/backport-7344
    
    Allow apps to add/modify config js output via hook.

 core/js/config.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git