diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-28 14:29:52 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-28 14:29:52 -0500 |
| commit | 145733c479f5e17ef8c8efdd61001fd62940f8a5 (patch) | |
| tree | 5c231051071eb0661ba6903db086910a4c6aa32d /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | 4ed847d81d1e10da91d5f8bae2f92e7af32dbe80 (diff) | |
| parent | a30869a525bd05cefb73bd731db6b9ed12e56c6c (diff) | |
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
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
0 files changed, 0 insertions, 0 deletions