Charles Strahan 47868cbfb8 Merge pull request #26127 from gabesoft/upstream-master ... Fixed meteor Future is not defined error		2017-07-11 17:59:51 -04:00
..
applications	Merge pull request #27301 from sternenseemann/jackline	2017-07-11 18:29:08 +01:00
build-support	Merge: more compatibility for git* fetchers	2017-07-09 10:31:24 +02:00
common-updater
data	data: update hackage snapshot some more	2017-07-11 14:41:13 +02:00
desktops	Merge pull request #27297 from jtojnar/fix/ghex	2017-07-11 18:43:10 +01:00
development	ocamlPackages.fpath: 0.7.1 -> 0.7.2	2017-07-11 21:00:43 +00:00
games	lib: introduce imap0, imap1 (#25543)	2017-07-04 23:29:23 +01:00
misc	vim-plugins: Add nim.vim	2017-07-10 12:29:03 -05:00
os-specific	linux-copperhead: 4.12.d -> 4.12.e	2017-07-11 08:22:56 -04:00
servers	Merge pull request #26127 from gabesoft/upstream-master	2017-07-11 17:59:51 -04:00
shells	nix-zsh-completions: add missing version to derivation name	2017-07-10 07:03:07 +02:00
stdenv	Merge branch 'staging' into master	2017-07-08 22:22:17 +02:00
test
tools	xvkbd: 3.7 -> 3.8	2017-07-11 22:44:44 +02:00
top-level	cutecom: 0.22.0 -> 0.44.0	2017-07-11 22:44:43 +02:00