Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php |
||
---|---|---|
.. | ||
calendar.js | ||
geo.js | ||
loader.js | ||
settings.js |
Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php |
||
---|---|---|
.. | ||
calendar.js | ||
geo.js | ||
loader.js | ||
settings.js |