summaryrefslogtreecommitdiffstats
path: root/Rakefile
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2016-03-22 17:19:48 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2016-03-22 17:19:48 +0100
commit54100edccdfd03ac38843306560e091a8b8a9705 (patch)
tree2a26cf404b44c22cbba8c9cc2c8a513174b33707 /Rakefile
parent8ed6f46ebab5a141dfe9dedc969bd9915d51437e (diff)
parent5ae204bdbd26fe93f63ffbe574c4d7ca060fb167 (diff)
Merge remote-tracking branch 'origin/devel' into feature/6354-vagrant-libvirt
Conflicts: vagrant/provision/assets/build-tails wiki/src/contribute/build.mdwn
Diffstat (limited to 'Rakefile')
0 files changed, 0 insertions, 0 deletions