Skip to content

Merge latest changes from upstream master

Stan Hu requested to merge sh-merge-master-upstream into master

This merges in the latest master from https://github.com/tpitale/mail_room.

Edited by Stan Hu

Merge request reports