Merge remote-tracking branch 'origin/staging'

Browse Source

Conflicts:
	pkgs/applications/version-management/subversion/default.nix

...

This commit is contained in:

Eelco Dolstra

2014-09-08 11:42:09 +02:00

parent ff85b53c5f a71744392b

commit 585983bc95

61 changed files with 3314 additions and 527 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2476

pkgs/os-specific/linux/systemd/fixes.patch

File diff suppressed because it is too large Load Diff