diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:25:26 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:25:26 +0100 |
| commit | 7aa8eb3427679366905840b80a69e36344a5632d (patch) | |
| tree | 347a2100ad445620ed21b17f9faa90fe0edb3874 /files/js/admin.js | |
| parent | b3661adf028570f6158dfd5092ecb1398d5be0df (diff) | |
| parent | eeaf539a4414e3081b6f6652167363a3221a1973 (diff) | |
| download | nextcloud-server-7aa8eb3427679366905840b80a69e36344a5632d.tar.gz nextcloud-server-7aa8eb3427679366905840b80a69e36344a5632d.zip | |
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
Diffstat (limited to 'files/js/admin.js')
0 files changed, 0 insertions, 0 deletions