Merge branch 'master' into test
Conflicts: acp/portal_module.php contrib/de.xml contrib/modx.prosilver.en.xsl contrib/subsilver2.xml contrib/update_201_to_202/contrib/de.xml contrib/update_201_to_202/contrib/modx.prosilver.en.xsl contrib/update_201_to_202/contrib/subsilver2.xml contrib/update_201_to_202/modx.prosilver.en.xsl contrib/update_201_to_202/update.xml includes/functions_upload.php install.xml language/de/modules/portal_attachments_module.php modules/custom.php modx.prosilver.en.xsl root/install/index.php root/portal/includes/functions.php root/portal/modules/portal_attachments.php root/portal/modules/portal_birthday_list.php root/portal/modules/portal_calendar.php root/portal/modules/portal_donation.php root/portal/modules/portal_poll.php root/styles/prosilver/template/portal/modules/donation_center.html root/styles/prosilver/theme/portal.css root/styles/subsilver2/template/portal/modules/recent_center.html root/umil/file.php root/umil/language/ar/umil.php root/umil/language/da/umil.php root/umil/language/de/umil.php root/umil/language/de_x_sie/umil.php root/umil/language/en/umil.php root/umil/language/es/umil.php root/umil/language/fr/umil.php root/umil/language/he/umil.php root/umil/language/hr/umil.php root/umil/language/hu/umil.php root/umil/language/id/umil.php root/umil/language/it/umil.php root/umil/language/ja/umil.php root/umil/language/nl-x-formal/umil.php root/umil/language/nl/umil.php root/umil/language/pl/umil.php root/umil/language/pt/umil.php root/umil/language/pt_br/umil.php root/umil/language/ro/umil.php root/umil/language/ru/umil.php root/umil/language/sk/umil.php root/umil/language/sv/umil.php root/umil/language/tr/umil.php root/umil/language/zh_cmn_hant/umil.php root/umil/style/parse.css root/umil/umil.php root/umil/umil_auto.php root/umil/umil_frontend.php styles/prosilver/template/portal/modules/birthdays_side.html styles/prosilver/template/portal/modules/recent_center.html
This commit is contained in:
Marc Alexander