JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,387 Commits 2 Branches 0 Tags 13 GiB
6ba65846e1
Commit Graph

22296 Commits

Author SHA1 Message Date
Frederik Rietdijk
731c82a447
Merge pull request #68244 from NixOS/staging-next 
Staging next that includes gcc8
 2019-09-09 08:09:36 +02:00
Silvan Mosberger
6128371279
Merge pull request #65489 from arcnmx/pr-bukubrow-update 
bukubrow: 2.4.0 -> 5.0.0
 2019-09-09 02:21:07 +02:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Lily Ballard
a8c3fb990f exa: adopt installShellFiles 
Also declare a separate "man" output.
 2019-09-08 15:07:13 -07:00
Lily Ballard
ed620603d4 ffsend: adopt installShellFiles 2019-09-08 15:00:52 -07:00
Frederik Rietdijk
47caef475f Merge master into staging-next 2019-09-08 20:45:29 +02:00
Frederik Rietdijk
5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next 
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
 2019-09-08 20:44:26 +02:00
Vladimír Čunát
6756cc5408
jing-trang: fixup build 
Thanks to lopsided98.  Fixes #68307.
 2019-09-08 18:19:51 +02:00
arcnmx
c33a44a885 bukubrow: 2.4.0 -> 5.0.0 2019-09-08 08:48:19 -07:00
Orivej Desh
88825bbbde freeimage: 3.17.0 -> 3.18.0 2019-09-08 14:46:31 +00:00
Frederik Rietdijk
e73f871285 Merge master into staging-next 2019-09-08 14:49:25 +02:00
Maximilian Bosch
4f67ff34d5
Merge pull request #68281 from doronbehar/update-sequoia 
sequoia: 0.9.0 -> 0.10.0
 2019-09-08 12:38:56 +02:00
Jan Tojnar
98d9589819
gnome-keysign: init at 1.0.1 (#57000) 
gnome-keysign: init at 1.0.1
 2019-09-08 03:44:11 +02:00
zimbatm
1fff2b0760
nixpkgs-fmt: 0.3.1 -> 0.5.0 2019-09-07 23:54:49 +02:00
Mario Rodas
493e51dead
Merge pull request #68270 from marsam/update-starship 
starship: 0.13.1 -> 0.15.0
 2019-09-07 14:40:31 -05:00
Jan Tojnar
7a0f2fc3a0
gmic-qt: 2.3.6 → 2.7.1 2019-09-07 20:15:57 +02:00
Jan Tojnar
ac757fbd42
gmic: 2.2.2 → 2.7.1 2019-09-07 20:15:56 +02:00
Jan Tojnar
d8749430e4
gmic-qt: allow building non-Krita hosts 
* Use qt5’s mkDerivation
* Also switch gimpPlugins.gmic to qmic-qt
 2019-09-07 19:55:11 +02:00
Jan Tojnar
8ad04d92f6
gmic-qt: format with nixpkgs-fmt 2019-09-07 19:55:11 +02:00
Jan Tojnar
7c22e3af30
gmic-qt-krita: rename from gmic_krita_qt 2019-09-07 19:55:10 +02:00
Doron Behar
176395f0f4 sequoia: 0.9.0 -> 0.10.0 2019-09-07 20:36:02 +03:00
Michael Weiss
629e8a1c77
html-proofer: 3.12.0 -> 3.12.2 2019-09-07 18:38:31 +02:00
Jan Tojnar
9fcdb3bd16
Merge branch 'master' into staging-next 2019-09-07 14:55:03 +02:00
adisbladis
723148f92e
elastic7: 7.0.1 -> 7.3.1 2019-09-07 12:48:42 +01:00
adisbladis
3ab433df34
elastic6: 6.7.2 -> 6.8.3 2019-09-07 12:43:40 +01:00
Mario Rodas
7a77001b07
starship: 0.13.1 -> 0.15.0 2019-09-07 04:20:00 -05:00
Marek Mahut
0822314bba
Merge pull request #68230 from johanot/morph-1.3.0 
morph: 1.2.0 -> 1.3.0
 2019-09-07 09:56:16 +02:00
Frederik Rietdijk
7e9e5cab45 Merge master into staging-next 2019-09-07 09:53:09 +02:00
zimbatm
406e29ff78 nix-store-gcs-proxy: init at 0.1.0 (#68139) 
* nix-store-gcs-proxy: init at 0.1.0

Co-Authored-By: Florian Klink <flokli@flokli.de>
 2019-09-06 20:25:45 -07:00
Johan Thomsen
a932f966c3 morph: 1.2.0 -> 1.3.0 2019-09-07 00:14:41 +02:00
Frederik Rietdijk
e68505e735 Merge remote-tracking branch 'upstream/gcc8' into staging-next 2019-09-06 23:25:18 +02:00
Frederik Rietdijk
66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Dylan Simon
d42ed9b401 graphviz: use git hash for removed release tag 2019-09-06 21:55:53 +02:00
xrelkd
2b53a91467 eksctl: 0.5.1 -> 0.5.2 2019-09-06 21:50:46 +02:00
Frederik Rietdijk
9b92496429
Merge pull request #68194 from adisbladis/drop-go-1_10 
Drop unsupported go version 1.10
 2019-09-06 19:14:02 +02:00
Doron Behar
f1bf4ec1f1 tinc: 1.0.35 -> 1.0.36 2019-09-06 19:13:29 +02:00
worldofpeace
5d4890b58d
Merge pull request #67585 from worldofpeace/system-config-printer 
nixos/system-config-printer: init
 2019-09-06 12:08:23 -04:00
worldofpeace
4c722b3351 system-config-printer: hardcode executable in udev rule 2019-09-06 12:06:32 -04:00
Jan Tojnar
f9237f3152
Merge branch 'master' into staging-next 2019-09-06 16:55:11 +02:00
adisbladis
4a1189e0ab
Merge pull request #68207 from adisbladis/elk-5-removal 
elasticsearch5/kibana5/beats5: Remove EOL packages
 2019-09-06 15:29:09 +01:00
Jörg Thalheim
35f0ffb704
eksctl: 0.5.0 -> 0.5.1 (#68188) 
eksctl: 0.5.0 -> 0.5.1
 2019-09-06 15:03:20 +01:00
adisbladis
4e30b30a65
logstash5: Remove EOL package 2019-09-06 14:22:15 +01:00
adisbladis
1b64fd7f53
journalbeat5: Remove EOL package 2019-09-06 14:22:15 +01:00
Mario Rodas
79303d4065
Merge pull request #68186 from marsam/update-procs 
procs: 0.8.5 -> 0.8.9
 2019-09-06 06:10:47 -05:00
Robert Hensing
089011e4f9
Merge pull request #68006 from volth/patch-361 
megacli: requireFile -> fetchurl
 2019-09-06 12:49:45 +02:00
worldofpeace
8b8b4abd55
Merge pull request #67280 from dtzWill/update/fortune-2.10.0 
fortune: 2.6.2 -> 2.10.0, use official tarball
 2019-09-06 05:29:04 -04:00
Jonathan Ringer
385567858f xmlroff: remove old patch 2019-09-06 02:08:09 -07:00
Jörg Thalheim
151dcce6d1
Merge pull request #68172 from jonringer/bump-xmlroff 
xmlroff: 0.6.2 -> 0.6.3
 2019-09-06 09:52:52 +01:00
Jonathan Ringer
34c089e7ce xmlroff: 0.6.2 -> 0.6.3 2019-09-05 23:59:03 -07:00
xrelkd
76064c57b9 eksctl: 0.5.0 -> 0.5.1 2019-09-06 14:53:20 +08:00
Sarah Brofeldt
57b66eb3f2
Merge pull request #68138 from johanot/ceph-14.2.3 
ceph: 14.2.1 -> 14.2.3
 2019-09-06 07:31:45 +02:00
Mario Rodas
56ddfa9d8f
procs: 0.8.5 -> 0.8.9 2019-09-06 00:00:00 -05:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next 
Fixed trivial conflicts caused by removing rec.
 2019-09-06 03:20:09 +02:00
Jan Tojnar
ed54a5b51d
Merge branch 'gtk-no-plus' 2019-09-06 02:57:51 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g 
GTK was renamed.
 2019-09-06 02:54:53 +02:00
adisbladis
4bca8b48fb
notary: Build with go 1.12 2019-09-05 22:33:40 +01:00
adisbladis
2ff836f6bf
diskrsync: unstable-2018-02-03 -> unstable-2019-01-02 2019-09-05 22:33:39 +01:00
Florian Klink
0213ccf624
Merge pull request #67894 from marzipankaiser/caffeine-ng 
caffeine-ng: use python3 and some other improvements
 2019-09-05 12:27:00 -07:00
Marcial Gaißert
d64cdba5b4
caffeine-ng: move setuptools_scm dependency to buildInputs 
setuptools_scm is only needed during build, not whilst using the package.
 2019-09-05 17:44:55 +02:00
Ryan Mulligan
50f5410954
Merge pull request #68124 from xrelkd/update/eksctl 
eksctl: 0.4.3 -> 0.5.0
 2019-09-05 06:30:59 -07:00
Johan Thomsen
161855c033 ceph: 14.2.1 -> 14.2.3 2019-09-05 14:33:29 +02:00
Peter Simons
52de09ce84 heimdall: fix the GUI front-end's run-time errors 2019-09-05 10:55:19 +02:00
Will Dietz
4f493117bb
Merge pull request #68060 from dtzWill/update/xbps-0.57 
xbps: 0.56 -> 0.57
 2019-09-05 02:12:57 -05:00
Marek Mahut
93fa56edb1
Merge pull request #68122 from buckley310/msf5 
metasploit: 4.16.1 -> 5.0.45
 2019-09-05 08:26:16 +02:00
Will Dietz
5e86891baa
Merge pull request #68082 from dtzWill/update/pngquant-2.12.5 
pngquant: 2.12.1 -> 2.12.5
 2019-09-04 21:29:03 -05:00
Will Dietz
222307978c
Merge pull request #68047 from dtzWill/update/txr-224 
txr: 220 -> 224
 2019-09-04 20:55:32 -05:00
Will Dietz
2e808509f0
xbps: fix build w/glibc, disable errors due to unused fread result 2019-09-04 20:47:29 -05:00
xrelkd
68ad416f34 eksctl: 0.4.3 -> 0.5.0 2019-09-05 09:38:28 +08:00
Sean Buckley
7d7d9e57f8 metasploit: 4.16.1 -> 5.0.45 2019-09-04 20:44:50 -04:00
Mario Rodas
044cc701c2
Merge pull request #68048 from marsam/update-netdata 
netdata: 1.16.0 -> 1.17.0
 2019-09-04 18:37:21 -05:00
Eelco Dolstra
37e333af9a
nix: 2.2.2 -> 2.3 2019-09-04 21:36:49 +02:00
Marek Mahut
9392493ccc
Merge pull request #68081 from dtzWill/update/stress-ng-0.10.02 
stress-ng: 0.10.01 -> 0.10.02
 2019-09-04 21:28:04 +02:00
Marek Mahut
89f9948082
Merge pull request #68090 from markus1189/aws-rotate-key-1-0-6 
aws-rotate-key: 1.0.4 -> 1.0.6
 2019-09-04 21:27:23 +02:00
Marek Mahut
4622046a2f
Merge pull request #68104 from peterhoeg/f/aucdtect 
aucdtect: pname was wrong
 2019-09-04 21:23:42 +02:00
Michael Raskin
e3fbbb1d10
Merge pull request #68083 from dtzWill/update/bdf2psf-1.193 
bdf2psf: 1.192 -> 1.193
 2019-09-04 15:20:44 +00:00
Sarah Brofeldt
55256d644b
Merge pull request #65470 from johanot/ceph-14-upstream 
ceph: 12.2.7 -> 14.2.1
 2019-09-04 17:08:28 +02:00
Johan Thomsen
fb22d67fa7 ceph: 13.2.4 -> 14.2.1 
* remove kinetic
* release note
* add johanot as maintainer

nixos/ceph: create option for mgr_module_path
  - since the upstream default is no longer correct in v14

* fix module, default location for libexec has changed
* ceph: fix test
 2019-09-04 16:17:18 +02:00
Marcial Gaißert
cdf8247b68
caffeine-ng: remove unneeded dependencies setuptools, wheel 2019-09-04 16:10:01 +02:00
Timo Kaufmann
ce37819c8b
home-manager: 2019-06-25 -> 2019-09-04 (#68100) 2019-09-04 16:01:59 +02:00
Kristoffer
85baedaca3 ceph: 12.2.7 -> 13.2.4 
* maintain only one version
* ceph-client: init
* include ceph-volume python tool in output

nixos/ceph: extraConfig, fix test, wait for ceph-mgr to become active

* run ceph with disk group permission
* add extraConfig option for the global section
needed per cluster
* clear up how ceph.conf is generated
* fix ceph testcase
 2019-09-04 16:01:42 +02:00
Peter Hoeg
dfea236a48 aucdtect: pname was wrong 2019-09-04 21:21:09 +08:00
Michael Weiss
875a09cbc6
html-proofer: 3.11.1 -> 3.12.0 2019-09-04 14:09:24 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Markus Hauck
3b32921a05 aws-rotate-key: 1.0.4 -> 1.0.6 2019-09-04 09:37:25 +02:00
Will Dietz
a35a5d049e
bdf2psf: 1.192 -> 1.193 2019-09-03 20:31:02 -05:00
Will Dietz
21c0acbd80
pngquant: 2.12.1 -> 2.12.5 
Looks like libimagequant is already at 2.12.5
 2019-09-03 20:28:57 -05:00
Will Dietz
1d3e71bf9b
stress-ng: 0.10.01 -> 0.10.02 2019-09-03 20:22:33 -05:00
Will Dietz
31e8b2d069
xbps: 0.56 -> 0.57 2019-09-03 19:29:49 -05:00
Will Dietz
1895278f20
httpie: 1.0.2 -> 1.0.3 2019-09-03 19:27:05 -05:00
Will Dietz
592274e72a
httpie: fetchPypi 2019-09-03 19:27:03 -05:00
Will Dietz
8ddc4e4731
httpie: pname-ify 2019-09-03 19:27:00 -05:00
Will Dietz
93f7a4f8c1
txr: 220 -> 224 
http://www.kylheku.com/cgit/txr/tree/RELNOTES?id=txr-224
http://www.kylheku.com/cgit/txr/tree/RELNOTES?id=txr-223
http://www.kylheku.com/cgit/txr/tree/RELNOTES?id=txr-222
http://www.kylheku.com/cgit/txr/tree/RELNOTES?id=txr-221
 2019-09-03 18:52:24 -05:00
Mario Rodas
e4bbf5cdbf
netdata: 1.16.0 -> 1.17.0 
Changelog: https://github.com/netdata/netdata/releases/tag/v1.17.0
 2019-09-03 16:20:00 -05:00
Christian Kampka
81d0173023 maintainers: update my maintainer information (#67686) 2019-09-03 22:52:13 +02:00
Franz Pletz
de85797565
Merge remote-tracking branch 'origin/master' into gcc-8 2019-09-03 22:15:07 +02:00
Franz Pletz
d512362e77
Revert "xbps: fix build with gcc8" 
This reverts commit f0a1f7e026.
 2019-09-03 22:07:06 +02:00
Franz Pletz
3a7a990ee9
irods: build with current version of llvm 2019-09-03 22:04:15 +02:00
worldofpeace
26b8a0a940
Merge pull request #68016 from worldofpeace/no-single-quote-placeholder 
treewide: don't use single quotes with placeholder
 2019-09-03 13:02:42 -04:00
worldofpeace
59e68d3b74 treewide: don't use single quotes with placeholder 2019-09-03 13:01:42 -04:00
Jan Tojnar
ad72ce9c2b
gnome-keysign: init at 1.0.1 2019-09-03 18:49:05 +02:00
Will Dietz
f0485a8524
fortune: 2.6.2 -> 2.10.0, use official tarball 2019-09-03 11:19:49 -05:00
worldofpeace
460927aae7
Merge pull request #67926 from flokli/fix-biber-tests 
biber: fix currently broken tests
 2019-09-03 12:11:53 -04:00
Florian Klink
5c0478a9ab biber: fix currently broken tests 2019-09-03 12:10:59 -04:00
Jan Tojnar
47df740549
Merge pull request #68008 from jtojnar/ibus-fixes 
ibus-engines.hangul: fix ibus-setup-hangul
 2019-09-03 17:58:46 +02:00
worldofpeace
62973ddc07
Merge pull request #67836 from petabyteboy/feature/corebootutils 
coreboot-utils: init at 4.10
 2019-09-03 11:54:36 -04:00
Milan Pässler
d977d48baf coreboot-utils: init at 4.10 
Build various tools from the coreboot tree with a generic builder for better
maintainability and provide a buildEnv with all of them, similar to other
distributions' coreboot-utils package.
 2019-09-03 17:49:50 +02:00
volth
31376b1962 megacli: requireFile -> fetchurl 2019-09-03 15:25:25 +00:00
Jan Tojnar
b73406d863
ibus-engines.hangul: fix ibus-setup-hangul 
Closes: https://github.com/NixOS/nixpkgs/issues/27619
 2019-09-03 15:46:20 +02:00
Jan Tojnar
743a62673f
ibus-engines.hangul: format with nixpkgs-fmt 2019-09-03 14:37:34 +02:00
Mario Rodas
0b768764ae
Merge pull request #67993 from xrelkd/update/bat 
bat: 0.12.0 -> 0.12.1
 2019-09-03 06:05:05 -05:00
Michael Weiss
3b7946d0ae
wallutils: 5.8.1 -> 5.8.2 2019-09-03 12:23:00 +02:00
xrelkd
102fd20492 bat: 0.12.0 -> 0.12.1 2019-09-03 16:35:32 +08:00
Averell Dalton
e0850f8a94 blueman: 2.0.8 -> 2.1.1 2019-09-03 10:26:54 +02:00
Mario Rodas
ef1441fa66
clair: 2.0.8 -> 2.0.9 2019-09-02 20:37:25 -05:00
Mario Rodas
46a603818b
Merge pull request #67911 from marsam/update-nfpm 
nfpm: 0.12.0 -> 0.13.0
 2019-09-02 19:25:52 -05:00
Mario Rodas
7389bdf566
Merge pull request #67276 from dtzWill/update/yubikey-manager-3.1.0 
yubikey-manager: 2.1.1 -> 3.1.0
 2019-09-02 19:23:51 -05:00
Ryan Mulligan
2e5fd3a2c3
Merge pull request #67963 from mstarzyk/miller-5.5.0 
miller: 5.4.0 -> 5.5.0
 2019-09-02 16:36:46 -07:00
Maciek Starzyk
36c72f3632 miller: back to fetchFromGitHub 2019-09-03 00:42:25 +02:00
Ryan Mulligan
32f9c619f5
Merge pull request #67969 from petabyteboy/feature/remove-dobuild 
treewide: remove uses of doBuild and doConfigure
 2019-09-02 15:13:47 -07:00
Milan Pässler (work)
185fd61631 treewide: remove uses of doBuild and doConfigure 
doBuild and doConfigure are not actually used by any builders, they were
probably added by mistake and just confuse people.
 2019-09-02 23:42:12 +02:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Maciek Starzyk
03d7679392 miller: 5.4.0 -> 5.5.0 2019-09-02 21:56:17 +02:00
Nathan van Doorn
ddefb5f067 q-text-as-data: init at 1.7.1 2019-09-02 11:08:14 +02:00
Andreas Wiese
8ba94a8fe8 grub2: 2.04-rc1 -> 2.04 (#67622) 2019-09-02 00:47:19 -04:00
Mario Rodas
2c71ef9ad5
nfpm: 0.12.0 -> 0.13.0 
Changelog: https://github.com/goreleaser/nfpm/releases/tag/v0.13.0
 2019-09-01 18:00:00 -05:00
Maximilian Bosch
ad70c1ca54
Merge pull request #67904 from sigma/pr/govmomi-0.21.0 
govc: 0.20.0 -> 0.21.0
 2019-09-01 23:34:27 +02:00
Yann Hodique
94387290a3 govc: 0.20.0 -> 0.21.0 2019-09-01 13:52:56 -07:00
adisbladis
c2fc61c5f7
Merge pull request #67872 from LnL7/minio-client 
minio-client: remove go 1.10 override
 2019-09-01 21:46:24 +01:00
Maximilian Bosch
9428d75536
Merge pull request #67879 from StillerHarpo/lolcat 
lolcat: 99.9.99 -> 100.0.0
 2019-09-01 21:10:35 +02:00
Marcial Gaißert
85c084d88d
caffeine-ng: use python3 
Using python3 is recommended by upstream.
 2019-09-01 21:08:33 +02:00
Marcial Gaißert
fc78d8e0a7
caffeine-ng: do not run tests 
There are no tests anyway. Not finding the tests results in build
failures if using Python 3.
 2019-09-01 20:28:08 +02:00
Florian Klink
7f42adf7a2
Merge pull request #67848 from flokli/google-compute-config-units 
google-compute-config.nix: fix comments, update google-*.service units, fix paths in gce
 2019-09-01 19:04:06 +02:00
Florian Klink
0934064791
Merge pull request #67841 from ivan/vulkan-loader-fix 
vulkan-headers, vulkan-tools: fix version
 2019-09-01 15:37:00 +02:00
Aaron Andersen
72646582a4
Merge pull request #64285 from tadeokondrak/ispell/update 
ispell: 3.3.02 -> 3.4.00
 2019-09-01 08:52:32 -04:00
Florian Engel
8d9bfb53c1 lolcat: 99.9.99 -> 100.0.0 2019-09-01 13:25:40 +02:00
Maximilian Bosch
46bbe13207
Merge pull request #67868 from dywedir/bat 
bat: 0.11.0 -> 0.12.0
 2019-09-01 11:20:51 +02:00
Daiderd Jordan
db131371ef
minio-client: remove go 1.10 override 2019-09-01 10:14:04 +02:00
xrelkd
cbd74442b7 youtube-dl: 2019.08.13 -> 2019.09.01 2019-09-01 15:05:56 +08:00
Vladyslav M
19387a02a2
bat: 0.11.0 -> 0.12.0 2019-09-01 09:53:09 +03:00
Lancelot SIX
6e4e0cf44d findutils: 4.6.0 -> 4.7.0 (#67753) 
See https://lists.gnu.org/archive/html/info-gnu/2019-08/msg00009.html
for release information
 2019-08-31 23:03:04 -04:00
Florian Klink
e95d4c734a google-compute-config.nix: use sysctl snippets from gce 
We make them available at ${gce}/sysctl.d and add them to
environments.etc, like we do with the systemd ones.
 2019-09-01 02:55:28 +02:00
Averell Dalton
c055ac14a5 fcitx: use enchant2 2019-09-01 02:53:52 +02:00
Florian Klink
10f5f8c5d8 google-compute-engine: patch shebangs in $out/bin, properly patch systemctl 2019-09-01 01:23:18 +02:00
Tadeo Kondrak
8dec5e6224
ispell: 3.3.02 -> 3.4.00 2019-08-31 13:35:46 -06:00
Ben Wolsieffer
38cac86769 rtmpdump: 2015-12-30 -> 2019-03-30 2019-08-31 13:51:28 -04:00
Ben Wolsieffer
29d9be2e72 rtmpdump: fix build with OpenSSL 1.1 2019-08-31 13:50:54 -04:00
Ivan Kozik
e54007370f vulkan-headers, vulkan-tools: fix version 
This fixes an assertion error in vulkan-loader on version == vulkan-headers.version:

assertion failed at /nix/store/ca66sbxzxlxlfpb579nxxnw97z2ql1gv-source/pkgs/development/libraries/vulkan-loader/default.nix:8:1

The sha256 for vulkan-headers and vulkan-tools are unchanged because
they were already set to the newer version. The correct version was
lost in the staging-next merge.
 2019-08-31 17:38:42 +00:00
markuskowa
ca15c0bd60
Merge pull request #67820 from Lassulus/nixos-generators 
nixos-generators: init at 1.0.0
 2019-08-31 19:26:45 +02:00
Frederik Rietdijk
98ef78326d Merge staging-next into staging 2019-08-31 18:07:33 +02:00
Frederik Rietdijk
96e5474329 Merge master into staging-next 2019-08-31 18:04:31 +02:00