Vladimír Čunát 5b0398dc36 Merge branch 'master' into staging-next ... Conflicts: gobby and libinfinity - I took the hand-edited versions instead of those resuting from the mass-replacement. Hydra: ?compare=1473190		2018-08-13 20:43:59 +02:00
..
activation	Merge pull request #43682 from primeos/never-stop-system.slice	2018-07-28 20:42:22 +02:00
boot	Merge branch 'master' into staging-next	2018-08-13 20:43:59 +02:00
etc	environment.etc: add user/group option	2017-07-29 23:56:46 +01:00