Matthew Barbour edc05b2f72 Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts:
#	ext/cron_uploader/main.php
2019-06-13 13:34:44 -05:00
..
2019-05-28 20:27:23 +01:00
2019-05-28 20:27:23 +01:00
2019-06-01 10:50:53 -05:00
2019-05-29 19:50:12 +01:00
2019-05-29 18:23:29 +01:00
2019-05-29 18:23:29 +01:00
2019-05-29 18:23:29 +01:00
2019-05-29 18:23:29 +01:00
2019-05-28 20:27:23 +01:00
2019-06-13 16:57:58 +01:00