[Pkg-owncloud-commits] [owncloud] 85/107: Merge pull request #21154 from owncloud/stable8.2-files-deleteactiontext

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit cd4cc15ac9d4fe36f532a7cc0d98b2d06c713bae
Merge: 411e400 5da3d56
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Dec 11 16:09:45 2015 +0100

    Merge pull request #21154 from owncloud/stable8.2-files-deleteactiontext
    
    [stable8.2] Stable8.2 files deleteactiontext

 apps/files/js/fileactions.js               | 26 +++++++++++++++++++++++---
 apps/files/js/fileactionsmenu.js           |  8 ++++++++
 apps/files/tests/js/fileactionsmenuSpec.js | 20 ++++++++++++++++++--
 3 files changed, 49 insertions(+), 5 deletions(-)

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