diff options
| author | makefu <root@pigstarter.de> | 2013-01-29 15:47:49 +0000 |
|---|---|---|
| committer | makefu <root@pigstarter.de> | 2013-01-29 15:47:49 +0000 |
| commit | d378ba7014c4757fd78ac437c74ac5cfadd2ccc1 (patch) | |
| tree | de3e6cfb2f1e7877e357fa773447017c9fd2d0a5 /cholerab/live.sh | |
| parent | f9a3b1b51a469ca56f9d573832ae50c7c3e38bd6 (diff) | |
| parent | 60f353a64ac890c35a327c9c2cbcbe0b7b2bc87c (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
Conflicts:
services/authorized_keys - add both keys
Diffstat (limited to 'cholerab/live.sh')
0 files changed, 0 insertions, 0 deletions