Merge branch 'develop' into 'master'

fix: old replication installation conflicts

See merge request slumber/multi-user!145
This commit is contained in:
Swann Martinez
2021-07-20 14:28:04 +00:00