Orivej Desh 66d4941afe Merge branch 'master' into staging ... * master: (48 commits) Mathematica: 11.0.1 -> 11.2.0 kbfs: 20170922.f76290 -> 20171004.40555d packer: 1.0.3 -> 1.1.0 libxdg-basedir: 1.0.2 -> 1.2.0 fscrypt: 0.2.1 -> 0.2.2 devtodo: init at 0.1.20 keybase: 1.0.30 -> 1.0.33 elixir: Fix locale problem on NixOS keybase-gui: 1.0.25 -> 1.0.33 terraform: 0.10.2 -> 0.10.7 (#30055) emby: 3.2.32.0 -> 3.2.33.0 sbcl: 1.3.21 -> 1.4.0 ardour: 5.11 -> 5.12 axoloti: fix evaluation axoloti: init at 1.0.12-1 melpa-packages: Add new lean packages fastlane: init at 2.60.1 nixos/traefik: guard example path go-ethereum: 1.7.0 -> 1.7.1 xzgv: 0.9.1 -> 0.9.2 ...		2017-10-05 07:41:39 +00:00
..
applications	Merge branch 'master' into staging	2017-10-05 07:41:39 +00:00
build-support	Merge branch 'master' into staging	2017-10-05 07:41:39 +00:00
common-updater
data	Merge branch 'master' into staging	2017-10-03 17:46:39 +00:00
desktops	Merge branch 'master' into staging	2017-10-03 17:46:39 +00:00
development	Merge branch 'master' into staging	2017-10-05 07:41:39 +00:00
games	Merge branch 'master' into staging	2017-10-02 00:22:12 +00:00
misc	Merge branch 'master' into staging	2017-10-03 17:46:39 +00:00
os-specific	Merge branch 'master' into staging	2017-10-05 07:41:39 +00:00
servers	Merge branch 'master' into staging	2017-10-05 07:41:39 +00:00
shells	oh-my-zsh: 2017-06-22 -> 2017-09-24	2017-09-26 08:59:08 -04:00
stdenv	Merge branch 'cc-wrapper-stdenvNoCC' into ericson2314-cross-base	2017-09-28 19:12:31 -04:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge branch 'master' into staging	2017-10-05 07:41:39 +00:00
top-level	Merge branch 'master' into staging	2017-10-05 07:41:39 +00:00