Mike Koch 9d874e10a5 Merge branch 'master' into '3-3-0'
# Conflicts:
#   api/BusinessLogic/Emails/BasicEmailSender.php
#   install/migrations/core.php
2018-03-02 17:41:56 +00:00
..
2017-10-12 22:13:18 -04:00
2017-11-03 21:44:06 -04:00
2017-09-26 22:08:14 -04:00
2018-02-04 21:16:18 -05:00
2018-02-04 21:16:18 -05:00
2016-11-18 12:57:17 -05:00