3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/development/tools/vagrant
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
..
default.nix Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00