[Pkg-owncloud-commits] [owncloud] 242/258: Merge pull request #11503 from owncloud/stable7-9753

[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 7097201eabb21a6e143ee9464e7d45b6a91afac2
Merge: 34c1760 f8675f6
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Fri Oct 10 13:02:28 2014 +0200

    Merge pull request #11503 from owncloud/stable7-9753
    
    Stable7 9753

 core/js/js.js                   |  2 +-
 core/js/tests/specs/coreSpec.js | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

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