Merge branch 'release/1.1.5' into 'stable'
[akkoma] / priv / static / static / terms-of-service.html
2017-06-24 Roger Braunupdate frontend.