mirror of
https://github.com/owncloudarchive/contacts.git
synced 2024-12-01 13:24:10 +01:00
dca605b41c
Fixed some conflicts. Conflicts: apps/contacts/css/styles.css apps/contacts/templates/index.php |
||
---|---|---|
.. | ||
formtastic.css | ||
styles.css |