Browse Source
Merge pull request #2 from KolushovAlexandr/11.0-merge_commit_conflict_resolving
🚑 fixes after merging. mail_move_message has no web_polimor…
pull/170/head
Ruslan Ronzhin
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
5 deletions
-
mail_move_message/__manifest__.py
-
mailgun/__manifest__.py
|
|
|
@ -1,7 +1,6 @@ |
|
|
|
# -*- coding: utf-8 -*- |
|
|
|
{ |
|
|
|
'name': 'Mail relocation', |
|
|
|
'version': '1.0.5', |
|
|
|
'version': '11.0.1.0.5', |
|
|
|
'author': 'IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko', |
|
|
|
'license': 'LGPL-3', |
|
|
|
'category': 'Discuss', |
|
|
|
@ -10,7 +9,7 @@ |
|
|
|
'website': 'https://twitter.com/yelizariev', |
|
|
|
'price': 100.00, |
|
|
|
'currency': 'EUR', |
|
|
|
'depends': ['mail_all', 'web_polymorphic_field'], |
|
|
|
'depends': ['mail_all'], |
|
|
|
'data': [ |
|
|
|
'mail_move_message_views.xml', |
|
|
|
'data/mail_move_message_data.xml', |
|
|
|
|
|
|
|
@ -1,4 +1,3 @@ |
|
|
|
# -*- coding: utf-8 -*- |
|
|
|
{ |
|
|
|
'name': "Mailgun", |
|
|
|
'author': "IT-Projects LLC, Ildar Nasyrov", |
|
|
|
@ -6,7 +5,7 @@ |
|
|
|
"support": "apps@it-projects.info", |
|
|
|
'website': "https://twitter.com/nasyrov_ildar", |
|
|
|
'category': 'Discuss', |
|
|
|
'version': '1.1.0', |
|
|
|
'version': '11.0.1.1.0', |
|
|
|
'depends': ['mail'], |
|
|
|
'data': [ |
|
|
|
'data/cron.xml', |
|
|
|
|
