summaryrefslogtreecommitdiffstats
path: root/search
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-05-15 17:57:18 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-05-15 17:57:18 +0200
commit12ebc5a1b3a6435a111b155ce2fffb19ca16a64a (patch)
treec40190a3488574ba214037628d3ec8f3b9434b6f /search
parent57c0a7ed693fec6ef487b71a514202b24dd70df2 (diff)
parent0916769f6764e2497f820419121599c3ce121e87 (diff)
downloadnextcloud-server-12ebc5a1b3a6435a111b155ce2fffb19ca16a64a.tar.gz
nextcloud-server-12ebc5a1b3a6435a111b155ce2fffb19ca16a64a.zip
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Diffstat (limited to 'search')
0 files changed, 0 insertions, 0 deletions