mirror of
https://github.com/owncloudarchive/contacts.git
synced 2024-11-29 11:24:11 +01:00
c682a3585d
Conflicts: admin.php lib/backend/ldap.php lib/dispatcher.php |
||
---|---|---|
.. | ||
addressbooks.js | ||
admin.js | ||
app.js | ||
config.php | ||
contacts.js | ||
groups.js | ||
jquery.combobox.js | ||
jquery.multi-autocomplete.js | ||
jquery.ocaddnew.js | ||
jquery.onfontresize.js | ||
loader.js | ||
modernizr.custom.js | ||
otherbackendconfig.js | ||
placeholder_polyfill.jquery.js | ||
placeholder_polyfill.jquery.min.combo.js | ||
storage.js |