Vladimír Čunát 5328aac7be

Merge branch 'staging' ...

Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497

2017-07-05 08:55:26 +02:00

..

applications

Merge branch 'staging'

2017-07-05 08:55:26 +02:00

build-support

Merge branch 'staging'

2017-07-05 08:55:26 +02:00

common-updater

…

data

papirus-icon-theme: init at 20170616

2017-07-04 17:46:04 +01:00

desktops

gnomeExtensions.topicons-plus: init at v20 (#27116)

2017-07-04 17:56:06 +01:00

development

Merge branch 'staging'

2017-07-05 08:55:26 +02:00

games

lib: introduce imap0, imap1 (#25543)

2017-07-04 23:29:23 +01:00

misc

Revert "splix: enable JBIG" (#27054)

2017-07-03 08:09:54 +01:00

os-specific

Merge branch 'staging'

2017-07-05 08:55:26 +02:00

servers

Merge branch 'staging'

2017-07-05 08:55:26 +02:00

shells

Merge branch 'master' into staging

2017-07-03 09:48:58 +02:00

stdenv

Merge branch 'staging'

2017-07-05 08:55:26 +02:00

test

…

tools

Merge branch 'staging'

2017-07-05 08:55:26 +02:00

top-level

Merge branch 'staging'

2017-07-05 08:55:26 +02:00