Pascal Wittmann a34579e01e Merge branch 'master' into add-missing-licenses ...

Conflicts:
	pkgs/tools/networking/network-manager/fortisslvpn.nix

2018-08-11 09:36:34 +02:00

..

applications

Merge branch 'master' into add-missing-licenses

2018-08-11 09:36:34 +02:00

build-support

Merge pull request #44870 from symphorien/tests-eval

2018-08-10 19:06:20 +02:00

common-updater

…

data

Merge branch 'master' into add-missing-licenses

2018-08-09 13:10:27 +02:00

desktops

plasma5: 5.13.2 -> 5.13.4 (#44643)

2018-08-10 10:45:59 +02:00

development

Merge branch 'master' into add-missing-licenses

2018-08-11 09:36:34 +02:00

games

Merge branch 'master' into add-missing-licenses

2018-08-09 13:10:27 +02:00

misc

Merge branch 'master' into add-missing-licenses

2018-08-11 09:36:34 +02:00

os-specific

Merge branch 'master' into add-missing-licenses

2018-08-11 09:36:34 +02:00

servers

Merge branch 'master' into add-missing-licenses

2018-08-11 09:36:34 +02:00

shells

…

stdenv

…

test

…

tools

Merge branch 'master' into add-missing-licenses

2018-08-11 09:36:34 +02:00

top-level

Merge pull request #44840 from nicknovitski/mruby-init

2018-08-10 19:34:22 -04:00