Merge develop into 201820_-_fix_mod_redir
authorrabuzarus <trebor@central-unit>
Thu, 21 Jun 2018 20:38:15 +0000 (22:38 +0200)
committerrabuzarus <trebor@central-unit>
Thu, 21 Jun 2018 20:38:15 +0000 (22:38 +0200)
commit22816c49a1972fff2e201dd66ac59b80624ee8aa
treec5e8c0a9f9611ccc18dcd4e63e47b53d18ab5f3e
parenta119636cd5f9057c37253a6d3ac8813b4dbe634f
parent4b0cf8d60f05c44f72b39bae1caae63284aacf44
Merge develop into 201820_-_fix_mod_redir