Austin Seipp 1155e2d8e4 Merge branch 'master' into staging		2018-11-02 14:18:45 -05:00
..
applications	Merge branch 'master' into staging	2018-11-02 14:01:15 -05:00
build-support	buildFHSUserEnv: use runScript in env (#49077)	2018-10-30 22:47:08 +01:00
common-updater
data	all-cabal-hashes: update to Hackage at 2018-11-02T16:36:33Z	2018-11-02 19:22:17 +01:00
desktops	xfce4-terminal: add missing gsettings schema dependency	2018-10-30 18:50:22 -04:00
development	Merge branch 'master' into staging	2018-11-02 14:18:45 -05:00
games	speed_dreams: fix compilation issues	2018-11-01 18:18:25 -04:00
misc	Merge pull request #49180 from symphorien/issue-49092	2018-11-02 08:18:47 +00:00
os-specific	Merge branch 'master' into staging	2018-11-02 14:40:14 +01:00
servers	nixpkgs: tidy up pgjwt package	2018-11-02 13:52:48 -05:00
shells	Merge pull request #49086 from dtzWill/update/zsh-completions	2018-10-25 14:59:25 +01:00
stdenv	Merge remote-tracking branch 'upstream/master' into release-lib-cleanup	2018-11-01 16:47:42 -04:00
test	Remove openftd	2018-10-21 21:52:20 +02:00
tools	Merge branch 'master' into staging	2018-11-02 14:01:15 -05:00
top-level	Merge branch 'master' into staging	2018-11-02 14:18:45 -05:00