diff options
| author | Wild Kat <wk@futureinquestion.net> | 2018-04-27 12:37:26 +0200 |
|---|---|---|
| committer | Wild Kat <wk@futureinquestion.net> | 2018-04-27 12:37:26 +0200 |
| commit | 8f1ac4ad5503ac4a59d41ebc3f142c1d5d097bfb (patch) | |
| tree | 8860b268793dd783b9b5cd5d1a255fe1edebfb0e /bin | |
| parent | cd92bac4a582eb8e19d9d036455591c9684eae72 (diff) | |
| parent | 34fd5369feee94ab45c5a81d7769b1df717e4c8c (diff) | |
Merge remote-tracking branch 'upstream/master' into pr-1280
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/oxidized | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/oxidized b/bin/oxidized index 7a0b03d..92730ee 100755 --- a/bin/oxidized +++ b/bin/oxidized @@ -1,6 +1,5 @@ #!/usr/bin/env ruby - # FIX ME, killing oxidized needs -9 trap("INT") { exit } # sinatra will otherwise steal this from us |