Merge remote-tracking branch 'refs/remotes/ivan/feature/more-conflictive-mails'
-rw-r--r-- 368 .gitignore
-rw-r--r-- 35121 LICENSE
-rw-r--r-- 96 README.md
drwxr-xr-x - src