Commit 2f28b14c authored by demitas's avatar demitas

Merge branch 'master' into 'master'

Update the real project with changes from personal fork. :)

See merge request fanzilla/core!1
parents 57dde3e9 d50650e4
Pipeline #108826 passed with stage
in 5 minutes and 16 seconds