Skip to content

Commit

Permalink
Merge remote-tracking branch 'peci1/shutdown-button' into shutdown-bu…
Browse files Browse the repository at this point in the history 
…tton

# Conflicts:
#	src/plugins/shutdown_button/ShutdownButton.cc
  • Loading branch information
@peci1
peci1 committed Jan 4, 2022
2 parents e32a0bc + e671485 commit 06192a2
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 06192a2

Please sign in to comment.