Merge branch 'master' into staging

Browse Source

Conflicts:
	gnu/local.mk
	gnu/packages/gdb.scm
	gnu/packages/lisp-xyz.scm
	gnu/packages/web-browsers.scm

...

This commit is contained in:

Marius Bakke

2020-11-07 21:33:32 +01:00

parent 052939c2f6 c2396ceb6e

commit 32787d6524

265 changed files with 88051 additions and 59881 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

gnu/packages/cran.scm

+177 -148

File diff suppressed because it is too large Load Diff