diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
| commit | f19276f7bc5fa74dff749112fffd350dad662148 (patch) | |
| tree | cf0ff38b4f42f4a0272b402a07f3fd91c7cd4c69 /.htaccess | |
| parent | fbea02bebb561f7a76a876065066c9face6e484e (diff) | |
| parent | fe24aafe7d55044e8e03a6ca2fc116174966951e (diff) | |
| download | nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.tar.gz nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.zip | |
Merge branch 'master' into no-css-js-delivery-via-php
Conflicts:
config/config.sample.php
Diffstat (limited to '.htaccess')
0 files changed, 0 insertions, 0 deletions