diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:20:25 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:20:25 +0200 |
| commit | 6b9072de581cf574f129bc1371355dbf91b818d8 (patch) | |
| tree | 2f15f77b0e4f85ef84d93d7409ab058c685275c0 /core/templates/error.php | |
| parent | c8cb870a27d1c2aa8ce1180114101cdcbccdf95b (diff) | |
| parent | 1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff) | |
| download | nextcloud-server-6b9072de581cf574f129bc1371355dbf91b818d8.tar.gz nextcloud-server-6b9072de581cf574f129bc1371355dbf91b818d8.zip | |
fix merge conflicts
Diffstat (limited to 'core/templates/error.php')
0 files changed, 0 insertions, 0 deletions