fix conflicts#93

gecitemre wants to merge 2 commits intoEnough-Software:mainEnough-Software/enough_mail_app:mainfrom

metuapp:fix/ios-notification-parametermetuapp/enough_mail_app:fix/ios-notification-parameterCopy head branch name to clipboard