5a99310cdf
Fixed some conflicts. Conflicts: apps/contacts/css/styles.css apps/contacts/templates/index.php |
||
---|---|---|
.. | ||
index.php | ||
part.addcardform.php | ||
part.chooseaddressbook.php | ||
part.chooseaddressbook.rowfields.php | ||
part.contacts.php | ||
part.details.php | ||
part.editaddressbook.php | ||
part.property.FN.php | ||
part.property.php | ||
part.setpropertyform.php | ||
settings.php |