13b52f6b6e
Conflicts: config/default.rb lib/vagrant/action/builtin/handle_box_url.rb plugins/commands/box/command/add.rb |
||
---|---|---|
.. | ||
vagrant | ||
vagrant.rb |
13b52f6b6e
Conflicts: config/default.rb lib/vagrant/action/builtin/handle_box_url.rb plugins/commands/box/command/add.rb |
||
---|---|---|
.. | ||
vagrant | ||
vagrant.rb |