source.dussan.org Git - nextcloud-server.git/commit

]> source.dussan.org Git - nextcloud-server.git/commit

projects / nextcloud-server.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0cb1330 ff9c85c)

author	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 26 Mar 2015 20:14:59 +0000 (21:14 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 26 Mar 2015 20:14:59 +0000 (21:14 +0100)
commit	232518ac548a1d8f99c51fe391eb6132c1154dba
tree	dcf369f169b600028bdb2d55d577fc7ffe781b32	tree \| snapshot
parent	0cb133003ced4e3d2486b6301459ea0e998ef2ec	commit \| diff
parent	ff9c85ce60aac1098c741b7ea630d9fc545e3d96	commit \| diff

Merge pull request #15234 from owncloud/encryption2_core

core part of encryption 2.0

lib/base.php	diff1 \|	diff2 \|	blob \| history
lib/private/files/fileinfo.php	diff1 \|	diff2 \|	blob \| history
lib/private/server.php	diff1 \|	diff2 \|	blob \| history
settings/admin.php	diff1 \|	diff2 \|	blob \| history
settings/css/settings.css	diff1 \|	diff2 \|	blob \| history
settings/js/admin.js	diff1 \|	diff2 \|	blob \| history
settings/templates/admin.php	diff1 \|	diff2 \|	blob \| history

Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server