diff options
author | Antoine Beaupré <anarcat@koumbit.org> | 2015-04-17 14:47:03 -0400 |
---|---|---|
committer | Antoine Beaupré <anarcat@koumbit.org> | 2015-04-17 14:47:03 -0400 |
commit | e9596d0f6d243ae00bb5b360a5c37bed577c5438 (patch) | |
tree | ea8e120b7d7ef84ba71391f39870092e43391627 /.travis.yml | |
parent | d4923b2c3ad74d813a9a2e5b39b6fa171ee95bc0 (diff) | |
parent | e2cad38276c2d2f0c952a5c2d2d0f9491e977961 (diff) | |
download | puppet-sshd-e9596d0f6d243ae00bb5b360a5c37bed577c5438.tar.gz puppet-sshd-e9596d0f6d243ae00bb5b360a5c37bed577c5438.tar.bz2 |
Merge remote-tracking branch 'micah/remove_etch' into shared
Conflicts:
templates/sshd_config/Debian_etch.erb
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions