summaryrefslogtreecommitdiffstats
path: root/lib/private/setup
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-11-26 19:15:53 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-11-26 19:15:53 +0100
commit7240d349da32af187b1920d8cf1cf67d81d268a1 (patch)
tree27e42cfe58e7de000ee4c0899a3c3afc8537079e /lib/private/setup
parentc7e1fe50c23771995bebf218c18deaf12ba628ca (diff)
parent1fef97f6a535cd79d0aea600634ec54c5f87bcea (diff)
downloadnextcloud-server-7240d349da32af187b1920d8cf1cf67d81d268a1.tar.gz
nextcloud-server-7240d349da32af187b1920d8cf1cf67d81d268a1.zip
Merge branch 'master' into encryption_initial_enc_indicator
Diffstat (limited to 'lib/private/setup')
0 files changed, 0 insertions, 0 deletions