Merge remote-tracking branch 'upstream/develop' into patch-bio
[akkoma] / priv / static / static / terms-of-service.html
2017-06-24 Roger Braunupdate frontend.