Skip to content

Fix merge conflicts from latest PR

Sean Newman requested to merge github/fork/pwnbus/master into master

Created by: pwnbus

The latest PR we merged (OpenVPN) caused merge conflicts for your branch at https://github.com/scoringengine/scoringengine/pull/612 so I tried to fix em for ya.

Merge request reports