opserver / Opserver

Stack Exchange's Monitoring System
https://opserver.github.io/Opserver/
MIT License
4.5k stars 827 forks source link

Sync with upstream #294

Closed mqbk closed 6 years ago

mqbk commented 6 years ago

Syncing with upstream

johnduhart commented 6 years ago

@mqbk Wrong repository.

By the way, your web.config has duplicate configuration values due to how you resolved a merge conflict in this commit.

NickCraver commented 6 years ago

Not sure what's happening here, but seems like the wrong PR direction.