You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Ruslan Ronzhin dd5bb64837
Merge pull request #1 from KolushovAlexandr/11.0-merge_commit_conflict_resolving
6 years ago
mail_all Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_archives Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_attachment_popup Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_base Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_check_immediately Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_fix_553 Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_move_message Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_multi_website 📖 add new contacts 6 years ago
mail_private Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_recovery Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_reply Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_sent Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mail_to Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
mailgun Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
res_partner_company_messages Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
res_partner_mails_count Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
.gitignore add .gitignore 8 years ago
.travis.yml Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
LICENSE Initial commit 9 years ago
README.md README: remove old name (OpenERP) 7 years ago
oca_dependencies.txt [CI] use it-projects-llc repo, because OCA's doesn't have 10.0 branch 8 years ago