Skip to content
Commit 7df32312 authored by Perry Barnoy's avatar Perry Barnoy
Browse files

Merge branch 'master' of https://github.com/NixOS/nixpkgs into xfce4-whiskermenu-plugin 

Pull from nixpkgs/master to resolve Travis CI build conflicts.
parents 3d179716 48d837f3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment