diff options
author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-10-14 17:14:36 +0200 |
---|---|---|
committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-10-16 14:42:16 +0200 |
commit | dade28cadd3d73feaf665cfd338928643b7c5793 (patch) | |
tree | 89741d6c6950cd409b24744cc50fbcc985f35021 /.htaccess | |
parent | a49d571799566d6b0e980a6dc73e641c07cc395d (diff) | |
parent | 62e19dfa8064c1d5a6d06d2d5c49e277716d4b4e (diff) | |
download | nextcloud-server-dade28cadd3d73feaf665cfd338928643b7c5793.tar.gz nextcloud-server-dade28cadd3d73feaf665cfd338928643b7c5793.zip |
Merge branch 'master' into downstream-ldap-3
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to '.htaccess')
0 files changed, 0 insertions, 0 deletions