diff options
author | Louis-Philippe VĂ©ronneau <pollito@riseup.net> | 2018-03-06 17:29:54 +0000 |
---|---|---|
committer | Louis-Philippe VĂ©ronneau <pollito@riseup.net> | 2018-03-06 17:29:54 +0000 |
commit | 7c40929d8a2a9438ccd883e9d856d526b852da8c (patch) | |
tree | d8529a383482db6cd716c16074e6b798c1069e7b /spec/tmp/.keep | |
parent | 228ae4a53999dbc49fa7c4d2883468dde10f19fb (diff) | |
parent | 6ebebe3ab04e8ba3d4b651e49012646046642160 (diff) |
Merge branch 'immerda-merge' into 'master'
Immerda merge
Closes #2
See merge request shared-puppet-modules-group/tor!19
Diffstat (limited to 'spec/tmp/.keep')
-rw-r--r-- | spec/tmp/.keep | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/spec/tmp/.keep b/spec/tmp/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/spec/tmp/.keep |