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
deps.nix	consul: 0.4.0 -> 0.4.1	2014-11-17 13:19:30 -08:00
Gemfile	bundixify consul-ui	2014-11-18 03:06:56 +00:00
Gemfile.lock	bundixify consul-ui	2014-11-18 03:06:56 +00:00
gemset.nix	bundixify consul-ui	2014-11-18 03:06:56 +00:00