diff options
| author | Robin <robin@Amaya.(none)> | 2010-04-28 12:15:52 +0200 |
|---|---|---|
| committer | Robin <robin@Amaya.(none)> | 2010-04-28 12:15:52 +0200 |
| commit | aacda0367d2894911098357e3c82c03071d27a02 (patch) | |
| tree | 649a2de3fdddeec31a7b9cf08444c559e9649226 /admin | |
| parent | fb498b9534b545c0e66cb82304e64f199c77a463 (diff) | |
| download | nextcloud-server-aacda0367d2894911098357e3c82c03071d27a02.tar.gz nextcloud-server-aacda0367d2894911098357e3c82c03071d27a02.zip | |
merge
Diffstat (limited to 'admin')
| -rwxr-xr-x[-rw-r--r--] | admin/index.php | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | admin/index.php~ | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/admin/index.php b/admin/index.php index 2331c22f062..2331c22f062 100644..100755 --- a/admin/index.php +++ b/admin/index.php diff --git a/admin/index.php~ b/admin/index.php~ index 8d1c8b69c3f..8d1c8b69c3f 100644..100755 --- a/admin/index.php~ +++ b/admin/index.php~ |