]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2182ae0 2d2cb09)
Merge pull request #14472 from owncloud/feature/wipencryptionapp
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 7 Apr 2015 14:46:45 +0000 (16:46 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 7 Apr 2015 14:46:45 +0000 (16:46 +0200)
encryption 2.0 app

1  2 
settings/js/personal.js patch | diff1 | diff2 | blob | history

diff --cc settings/js/personal.js
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server