Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next"" ...

In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.

This reverts commit 0be87c7979.

2020-02-05 19:41:25 +01:00

..

applications

Revert "Revert "Merge master into staging-next""

2020-02-05 19:41:25 +01:00

build-support

bazel-deps: remove

2020-02-04 12:35:47 +11:00

common-updater

common-updater-scripts: move destructive changes further in the script

2020-02-04 06:25:38 +01:00

data

Merge pull request #79173 from chkno/nerd-fonts

2020-02-05 00:17:39 +01:00

desktops

gnustep/base: replace libbfd with binutils-unwrapped

2020-02-03 18:42:42 +01:00

development

Revert "Revert "Merge master into staging-next""

2020-02-05 19:41:25 +01:00

games

dwarf-fortress: Update themes.json

2020-02-03 00:57:53 -08:00

misc

lilypond: mark not broken on Darwin

2020-02-02 12:23:48 -08:00

os-specific

Revert "Revert "Merge master into staging-next""

2020-02-05 19:41:25 +01:00

servers

Revert "Revert "Merge master into staging-next""

2020-02-05 19:41:25 +01:00

shells

Revert "Revert "Merge master into staging-next""

2020-02-05 19:41:25 +01:00

stdenv

Merge staging-next into staging

2020-02-02 15:33:13 +01:00

test

llvm_4: remove

2020-01-30 18:35:31 -05:00

tools

Revert "Revert "Merge master into staging-next""

2020-02-05 19:41:25 +01:00

top-level

Revert "Revert "Merge master into staging-next""

2020-02-05 19:41:25 +01:00