Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
[akkoma] / priv / static / static / terms-of-service.html
2017-06-24 Roger Braunupdate frontend.