[Pkg-owncloud-commits] [owncloud] 133/165: Merge pull request #15713 from owncloud/fix-15707-master

[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 4b968da9e64c4bfbdd166caaff4fab9bfc47a182
Merge: b0fcf0f 490e779
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Apr 21 12:47:43 2015 +0200

    Merge pull request #15713 from owncloud/fix-15707-master
    
    [enc2] Fixing JS errors

 apps/encryption/js/encryption.js        | 17 ++++++--------
 apps/encryption/js/settings-admin.js    | 19 +++++++++-------
 apps/encryption/js/settings-personal.js | 40 +++++++++++++++++++--------------
 settings/js/personal.js                 | 10 +++++----
 4 files changed, 47 insertions(+), 39 deletions(-)

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