Learn more about cloning repositories
You have read-only access
Merge branch 'master' of https://dev.flarecast.eu/stash/scm/infra/dev-infra Conflicts: webapp/static/js/fpmc.js webapp/templates/layout.html
