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-01 22:03:09 -04:00
2017-10-01 22:03:09 -04:00
2017-10-01 22:03:09 -04:00
2017-10-03 22:05:35 -04:00
2017-11-01 21:52:17 -04:00
2017-11-01 21:55:35 -04:00
2017-10-31 08:11:37 -04:00
2017-10-31 17:31:03 -04:00
2017-10-03 22:05:35 -04:00
2018-03-02 17:41:56 +00:00