Merge remote-tracking branch 'upstream/master' into redesign
Conflicts: static/About/Room-secondary.txt static/About/Room.txt templates/head.tpl templates/index.tpl
Showing
.gitlab-ci.yml
0 → 100644
htdocs/js/pngfix.js
deleted
100644 → 0