4bf13adff2
Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php |
||
---|---|---|
.. | ||
contacts.css | ||
jquery.Jcrop.css | ||
jquery.combobox.css |
4bf13adff2
Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php |
||
---|---|---|
.. | ||
contacts.css | ||
jquery.Jcrop.css | ||
jquery.combobox.css |