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
parent
commit
0867197ac7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      mail_move_message/__manifest__.py
  2. 3
      mailgun/__manifest__.py

5
mail_move_message/__manifest__.py

@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
{ {
'name': 'Mail relocation', 'name': 'Mail relocation',
'version': '1.0.5',
'version': '11.0.1.0.5',
'author': 'IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko', 'author': 'IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko',
'license': 'LGPL-3', 'license': 'LGPL-3',
'category': 'Discuss', 'category': 'Discuss',
@ -10,7 +9,7 @@
'website': 'https://twitter.com/yelizariev', 'website': 'https://twitter.com/yelizariev',
'price': 100.00, 'price': 100.00,
'currency': 'EUR', 'currency': 'EUR',
'depends': ['mail_all', 'web_polymorphic_field'],
'depends': ['mail_all'],
'data': [ 'data': [
'mail_move_message_views.xml', 'mail_move_message_views.xml',
'data/mail_move_message_data.xml', 'data/mail_move_message_data.xml',

3
mailgun/__manifest__.py

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
{ {
'name': "Mailgun", 'name': "Mailgun",
'author': "IT-Projects LLC, Ildar Nasyrov", 'author': "IT-Projects LLC, Ildar Nasyrov",
@ -6,7 +5,7 @@
"support": "apps@it-projects.info", "support": "apps@it-projects.info",
'website': "https://twitter.com/nasyrov_ildar", 'website': "https://twitter.com/nasyrov_ildar",
'category': 'Discuss', 'category': 'Discuss',
'version': '1.1.0',
'version': '11.0.1.1.0',
'depends': ['mail'], 'depends': ['mail'],
'data': [ 'data': [
'data/cron.xml', 'data/cron.xml',

Loading…
Cancel
Save