summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-24 20:54:13 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-24 20:54:13 +0200
commit946e9ccc0ade60bb9ff34ace9e94e85cce6af96c (patch)
tree4770fb73b25d6eb50caa2149df8fb06dd8928a45 /config
parent5076c0d392f6eb17e368a9382cf5b0abe7408889 (diff)
parentae9adcaf8cc1f2b279494cfdd30a1d62d41f5060 (diff)
downloadnextcloud-server-946e9ccc0ade60bb9ff34ace9e94e85cce6af96c.tar.gz
nextcloud-server-946e9ccc0ade60bb9ff34ace9e94e85cce6af96c.zip
Merge branch 'master' into fix_for_2377
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions