Open mvetom opened 5 months ago
I resolved the conflicts in this merge. Some new conflicts might arise after other branches are merged though, as the changes were on files that were being edited on the other branches as well (calendar/events, for instance).
Creating pull request now per your request.
Let me know if you have any questions or suggestions