diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-03-07 23:38:44 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-03-07 23:38:44 +0100 |
| commit | ae7aab2d6e727f9daf683056001a982aad242c93 (patch) | |
| tree | 9dc0ade66c54dc846f4591587393aacd11be8622 /settings/appinfo | |
| parent | 91d85e9b1640e9d62707cd1c232c8c7a9fc8b9c3 (diff) | |
| parent | d8cfe77ba5348d29a9e2b046e2c7efc1dd4758cb (diff) | |
| download | nextcloud-server-ae7aab2d6e727f9daf683056001a982aad242c93.tar.gz nextcloud-server-ae7aab2d6e727f9daf683056001a982aad242c93.zip | |
Merge gitorious.org:owncloud/owncloud into vcategories
Conflicts:
apps/contacts/ajax/saveproperty.php
apps/contacts/lib/vcard.php
Diffstat (limited to 'settings/appinfo')
0 files changed, 0 insertions, 0 deletions