Merge branch 'feature/document_importer' into nightly

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
2019-06-21 17:39:19 -04:00
parent 885d430b98 39eabe1c54
commit d2affdcf21
3 changed files with 10 additions and 7 deletions
--- a/docs/releases/3.2.3.rst
+++ b/docs/releases/3.2.3.rst
@@ -19,7 +19,6 @@ Changes
  GitLab issue #625. Thanks to Jesaja Everling (@jeverling)
  for the report and the research.

-
 Removals
 --------

@@ -107,12 +106,8 @@ Backward incompatible changes
 Bugs fixed or issues closed
 ---------------------------

-<<<<<<< HEAD
- :gitlab-issue:`615`
-=======
 - :gitlab-issue:`619` poplib.POP3_SSL and poplib.POP3 initialized with wrong kwarg
 - :gitlab-issue:`625` mayan.apps.mailer.mailers.DjangoSMTP uses "user", but django.core.mail.backends.smtp.EmailBackend expects "username"
 - :gitlab-issue:`626` Mailing profile error log is empty, despite errors
->>>>>>> versions/minor

 .. _PyPI: https://pypi.python.org/pypi/mayan-edms/