[Pkg-owncloud-commits] [owncloud] 27/34: Merge pull request #11371 from owncloud/backport-11368

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.6
in repository owncloud.

commit 55573645c6ebcbe3710150b55a94fe117c476a2d
Merge: de8c624 979d282
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Oct 20 09:13:26 2014 +0200

    Merge pull request #11371 from owncloud/backport-11368
    
    Load public preview via JS

 apps/files_sharing/css/public.css       |  5 -----
 apps/files_sharing/js/public.js         | 23 +++++++++++++++++++++++
 apps/files_sharing/templates/public.php | 20 ++++++++++----------
 core/js/js.js                           | 17 +++++++++++++++++
 lib/private/preview.php                 | 10 ++++++++++
 5 files changed, 60 insertions(+), 15 deletions(-)

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