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.
KolushovAlexandr 4a657bf2e7
Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving
6 years ago
..
i18n Merge branch '11.0' of github.com:it-projects-llc/mail-addons into 11.0-merge_commit_conflict_resolving 6 years ago
__manifest__.py 🌈 all the __openerp__.py files renamed in __manifest__.py 6 years ago