diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
| commit | 46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3 (patch) | |
| tree | 78896053233f385afbdc6006eade163626048bf6 /.htaccess | |
| parent | 7d2a68fc314bcefa69413d85e69ffd10dc34ddc5 (diff) | |
| parent | 3a184e2e1d7ae49d596e06b724ffc36382d02596 (diff) | |
| download | nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.tar.gz nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.zip | |
fix merge conflicts
Diffstat (limited to '.htaccess')
0 files changed, 0 insertions, 0 deletions