diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
commit | a3e390abebfaeb7c2c8f57dcf721075e85801a4c (patch) | |
tree | 52384648eb1383dc1bdf2916147f260cbccba71e /src/systemd-ac-power | |
parent | aab3aab0b571d8ebb3316808f7da91fda86fa180 (diff) | |
parent | 7a901e86b9e5ae219ee5db89453864ff4ea19afd (diff) |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/systemd-ac-power')
0 files changed, 0 insertions, 0 deletions