« back to all changes in this revision
Viewing changes to fetchmail_inbox/security/res_groups.xml
- Committer: Ronald Portier
- Date: 2014-03-28 13:12:43 UTC
- mfrom: (81.5.17 therp-addons-7.0)
- Revision ID: ronald@therp.nl-20140328131243-d06yj7u2o9fhshrw
[MERGE] Merge upstream changes
- resolve text conflict in fetchmail_invoice.
- resolve text conflict in fetchmail_invoice.
- files added:
- analytic_debit_credit
- analytic_debit_credit/static
- analytic_debit_credit/static/src
- analytic_debit_credit/static/src/img
- fetchmail_inbox
- fetchmail_inbox/data
- fetchmail_inbox/i18n
- fetchmail_inbox/model
- fetchmail_inbox/security
- fetchmail_inbox/static
- fetchmail_inbox/static/src
- fetchmail_inbox/static/src/img
- fetchmail_inbox/view
- fetchmail_inbox/wizard
- fetchmail_inbox_invoice
- fetchmail_inbox_invoice/i18n
- fetchmail_inbox_invoice/model
- fetchmail_inbox_invoice/security
- fetchmail_inbox_invoice/static
- fetchmail_inbox_invoice/static/src
- fetchmail_inbox_invoice/static/src/img
- fetchmail_inbox_invoice/view
- fetchmail_inbox_invoice/wizard
- fetchmail_invoice/static
- fetchmail_invoice/static/src
- fetchmail_invoice/static/src/img
- partner_name_dutch
- partner_name_dutch/i18n
- partner_name_dutch/model
- partner_name_dutch/scripts
- partner_name_dutch/static
- partner_name_dutch/static/src
- partner_name_dutch/static/src/img
- partner_name_dutch/view
- files removed:
- account_report_alt
- account_report_alt/i18n
- account_report_alt/report
- account_report_alt/wizard
- trp_report_address
- files modified:
- fetchmail_invoice/model/fetchmail_invoice.py
added
removed
fetchmail_inbox/security/res_groups.xml
