Merge remote-tracking branch 'hbrunn/8.0-newsletter' into 8.0

Conflicts: newsletter/README.rst Resolved conflicts by adding OCA to author modules. Added license AGPL-3 while I was at it.
OCA · Mar 22, 2015 · 459cbbb · 459cbbb
2 parents 23921fb + 4a216b1
commit 459cbbb
Show file tree

Hide file tree

Showing 25 changed files with 686 additions and 457 deletions.
diff --git a/__unported__/newsletter/model/email_template.py b/__unported__/newsletter/model/email_template.py
diff --git a/__unported__/newsletter/model/newsletter_newsletter.py b/__unported__/newsletter/model/newsletter_newsletter.py
diff --git a/__unported__/newsletter/model/newsletter_type.py b/__unported__/newsletter/model/newsletter_type.py