Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Mon, 30 Jul 2018 16:08:28 +0000 (18:08 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Mon, 30 Jul 2018 16:08:28 +0000 (18:08 +0200)
commit869250809bddcf8eab26ecdedabad6fc060751dd
tree2108049faa07fd2b79d679799fa51ce8a2e5612a
parentf419abea22fe5dd3aa96c19990316e502157350b
parentf475b90c353deff5b848753bf88c855f481f1ec0
Merge branch 'master' into staging
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/java.scm
gnu/packages/maths.scm
gnu/packages/python.scm
gnu/packages/video.scm