Commit Graph

28880 Commits

Author SHA1 Message Date
Daniel Duan
fcd88c820d tre: init at 0.2.2
tre is a improved version of the command `tree`. Its main additions:

1. colored output
2. ignores paths specified in .gitignore
3. editor alias for each entity listed

Source/Homepage: https://github.com/dduan/tre
2019-11-03 13:18:13 -08:00
Jan Tojnar
3df93dbe0e
Merge pull request #72386 from jtojnar/gimp-2.10.14
gimp: 2.10.12 → 2.10.14
2019-11-03 21:48:13 +01:00
Thomas Kerber
985d97d785
libraspberrypi: init at 2019-10-22 2019-11-03 20:21:19 +00:00
worldofpeace
7c4f09f695
Merge pull request #72319 from gnidorah/mame
mame: init at 0.215
2019-11-03 19:18:53 +00:00
Daiderd Jordan
80a5dd7f02
gegl: fix darwin build
../gegl/opencl/cl_gl.h:37:10: fatal error: 'OpenGL/CGLDevice.h' file not found
    #include <OpenGL/CGLDevice.h>
2019-11-03 18:59:24 +01:00
Marek Mahut
084ae71601
Merge pull request #72725 from 1000101/dokuwiki
dokuwiki: init at 2018-04-22b
2019-11-03 18:20:48 +01:00
worldofpeace
c751f6000b
Merge pull request #69052 from worldofpeace/elementary-updates-maybe-5.1
Pantheon 5.1
2019-11-03 17:03:04 +00:00
gnidorah
cf17479caa sdlmame: drop
There are no longer separate programs called SDLMAME or SDLMESS. Instead, the SDL capability is included in MAME and MESS, and the makefile will auto-detect if you are on a non-Windows system and run accordingly.
2019-11-03 20:02:16 +03:00
gnidorah
f73694a64a mess: drop
MAME and MESS are now combined as one distribution as of the 0.162 release and offered as a MAME binary (MESS is included in the build).
2019-11-03 20:02:16 +03:00
gnidorah
d296e58f6d mame: init at 0.215 2019-11-03 20:02:11 +03:00
Gabriel Ebner
1af9ccccb0 linuxPackages.digimend: init at unstable-2019-06-18 2019-11-03 17:32:46 +01:00
Matthew Bauer
e569d1e99e
Merge pull request #72683 from etu/emacs-latest-nox
emacs-nox: Add alias for emacs26-nox
2019-11-03 11:29:42 -05:00
Renaud
36c6d76db4
Merge pull request #57786 from Enteee/master
keepass-keepassotpkeyprov: init at 2.6
2019-11-03 16:59:05 +01:00
Jan Hrnko
4792479a41 dokuwiki: init at stable_2018-04-22b 2019-11-03 16:52:06 +01:00
worldofpeace
eee1e3c1b6
Merge pull request #72043 from jonafato/gnomeExtensions.night-theme-switcher-init
gnomeExtensions.night-theme-switcher: init at 2.1
2019-11-03 14:46:47 +00:00
Jon Banafato
0724efc305 gnomeExtensions.night-theme-switcher: init at 2.1 2019-11-03 09:34:10 -05:00
Jan Tojnar
258f6f4437
gegl_0_4: 0.4.16 → 0.4.18
https://gitlab.gnome.org/GNOME/gegl/blob/GEGL_0_4_18/docs/NEWS.txt#L1-123

Ported to Meson, which means ton of extra dependencies used by default.
Though the closure size effect appears to be minimal: 88.9M → 92.9M

Also drop GTK dependency, since it is not needed any more (was it ever?)
2019-11-03 14:43:09 +01:00
Alex Rice
66611546f0 brillo: init at 1.4.8 2019-11-03 14:42:43 +01:00
Franz Pletz
286bfac78c
libksi: 2015-07-03 -> 3.20.3025 2019-11-03 14:33:50 +01:00
Jan Tojnar
148eae459b
poly2tri-c: init at 0.1.0 2019-11-03 14:31:38 +01:00
Frederik Rietdijk
9d59d57d45 Merge staging-next into staging 2019-11-03 14:01:28 +01:00
Tobias Mayer
a7cd3c2d82 cmake-format: init at 0.6.0 2019-11-03 13:47:38 +01:00
Ente
8177aa48c3 keepass-otpkeyprov: init at 2.6 2019-11-03 13:22:57 +01:00
zimbatm
01f6d4d36f
Merge pull request #72419 from WilliButz/rubyPackages/remove-global-v8-pinning
rubyPackages: remove global v8 pinning
2019-11-03 12:19:18 +00:00
Renaud
c7fdfc4128
Merge pull request #72581 from romildo/upd.theme-jade1
theme-jade1: 3.3 -> 1.5
2019-11-03 10:25:11 +01:00
Frederik Rietdijk
76b16d05e6 Merge staging-next into staging 2019-11-03 10:24:24 +01:00
Elis Hirwing
0b27dd0bde
emacs-nox: Add alias for emacs26-nox 2019-11-03 09:56:41 +01:00
Michael Raskin
07da1ca8b5
Merge pull request #72491 from urkud/inkscape-cleanup
inkscape: use latest poppler, use gtkspell2, drop `-fpermissive`
2019-11-03 06:52:59 +00:00
Jan Tojnar
1c74b29b05
pinentry-gnome: fix target output 2019-11-03 04:19:10 +01:00
Franz Pletz
fbb1165625
varnishPackages: general version bumps & refactor 2019-11-03 00:12:04 +01:00
Yury G. Kudryashov
ba0a68c45b inkscape: use latest poppler, use gtkspell2, drop -fpermissive
It seems that `inkscape-0.9.4` builds with the latest poppler and
without the `-fpermissive` workaround.
2019-11-02 17:47:15 -04:00
Theodore Witkamp
f2860971a2 muparser: add darwin support 2019-11-02 14:31:01 -07:00
Marek Mahut
107fc18d2f
Merge pull request #72455 from mmahut/trac
trac: init at 1.4
2019-11-02 16:23:49 +01:00
José Romildo Malaquias
51c4691bb5 theme-jade1: move to data/themes 2019-11-02 11:35:53 -03:00
José Romildo Malaquias
8011c943f0 lounge-gtk-theme: init at 1.22 2019-11-02 09:20:48 -03:00
Kolby Crouch
eb4dd1794d retroarch: update cores 2019-11-02 06:16:10 -05:00
Marek Mahut
94e92dd714 trac: init at 1.4 2019-11-02 10:28:18 +01:00
Joseph Lukasik
babd3f7747 apacheHttpdPackage.mod_tile: init at unstable-2017-01-08 2019-11-01 22:52:14 -07:00
Jörg Thalheim
b55a7a3a57
ec2-utils: init at 0.5.1, include in amazon-image profile (#67347)
ec2-utils: init at 0.5.1, include in amazon-image profile
2019-11-01 20:57:44 +00:00
Simon Weber
db369f716f pkgdiff: init at 1.7.2 2019-11-01 13:47:52 -07:00
Marek Mahut
b3cf2d2508 qtbitcointrader: using mkDerivation for Qt5 2019-11-01 20:03:59 +01:00
Marek Mahut
43a0b4b31f
Merge pull request #72415 from 1000101/trickster
nixos/trickster: init
2019-11-01 15:39:50 +01:00
Doron Behar
cf2a4fff01 urxvt_bidi: init at 2.15 (#70312)
Add plugin to default wrapper.
2019-11-01 10:36:20 -04:00
WilliButz
e4c372445f
v8_3_16_14: remove unreferenced and outdated package 2019-11-01 14:28:03 +01:00
Jeroen Wijenbergh
8a50025063
tealdeer: 1.1.0 -> 1.2.0 2019-11-01 12:27:53 +02:00
Jan Hrnko
8b41fa2cc0 trickster: init at 0.1.10 2019-11-01 10:56:59 +01:00
Jan Tojnar
70c0c48970
Merge branch 'staging-next' into staging 2019-11-01 02:58:40 +01:00
worldofpeace
7a4ea26f2e vala-lint: init at 2019-10-11 2019-10-31 21:15:53 -04:00
Maximilian Bosch
8a0fdf0011
Merge pull request #72195 from Ma27/package-fzf-zsh
fzf-zsh: init at unstable-2019-09-09
2019-10-31 23:32:02 +01:00
Jan Tojnar
b45c5dc0aa
libabigail: init at 1.6 (#72383)
libabigail: init at 1.6
2019-10-31 21:47:52 +01:00
Pavol Rusnak
b877d845de
libabigail: init at 1.6
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2019-10-31 20:56:19 +01:00
Niklas Hambüchen
62fbcea807
Merge pull request #72057 from nh2/polkit-musl-elogind
musl support for polkit, add elogind
2019-10-31 17:05:42 +01:00
worldofpeace
c613d70550
Merge pull request #72313 from worldofpeace/fixup-twitter-font
twitter-color-emoji: use noto-fonts-emoji’s src
2019-10-31 14:41:47 +00:00
Jan Tojnar
55191b67a8 contrast: init at 0.0.2 2019-10-31 09:46:15 -04:00
Marek Mahut
bd2bccc47d
Merge pull request #72144 from chessai/libck-init
libck: init at 0.7.0
2019-10-31 13:03:06 +01:00
Renaud
ccae78ca4f
Merge pull request #71486 from chessai/forge-add
forge: init at 1.0.4
2019-10-31 11:40:24 +01:00
Marek Mahut
392b12f252
Merge pull request #72089 from prusnak/trezor-udev-rules
trezor-udev-rules: init at unstable-2019-07-17
2019-10-31 10:48:48 +01:00
Jörg Thalheim
c91a1be877
nixos/orangefs: init at 2.9.7, add modules and test (#67591)
nixos/orangefs: init at 2.9.7, add modules and test
2019-10-31 09:27:14 +00:00
Mario Rodas
f73e006509
Merge pull request #72267 from magnetophon/sjaehn
bshapr & bsequencer: init at v0.4
2019-10-30 20:42:04 -05:00
Bart Brouns
067a563331 bshapr: init at v0.4 2019-10-31 02:18:42 +01:00
Bart Brouns
cd6974fd24 bsequencer: init at v0.4 2019-10-31 02:11:00 +01:00
Jan Tojnar
fc1a7289ed
scfbuild: switch to Python 3
Needed to drop phases @#$% to be able to use this at all.

Fixes emojione and twemoji-color-font
2019-10-31 01:10:44 +01:00
Vladyslav M
0a9950af05
wofi: init at 2019-10-28 (#72298)
wofi: init at 2019-10-28
2019-10-30 23:50:00 +02:00
Justin Humm
9b66a895c2
wofi: init at 2019-10-28 2019-10-30 22:23:10 +01:00
Vincent Laporte
60f50b69a6 haxe: refactor out of ocamlPackages 2019-10-30 18:05:20 +00:00
Vincent Laporte
7e51c79f17 monotoneViz: refactor out of ocamlPackages 2019-10-30 18:05:20 +00:00
Jason Felice
e4c34f2db4 osxsnarf: init at 0.1.0 2019-10-30 08:57:59 -07:00
Sebastian Jordan
b52df5b679 pypi2nix: 1.8.1 -> 2.0.0 2019-10-30 08:19:39 -07:00
Mario Rodas
57c922972a
Merge pull request #72256 from magnetophon/bslizr
bslizr: init at 1.2.0
2019-10-30 09:25:01 -05:00
Pavol Rusnak
d124858efe
trezor-udev-rules: init at unstable-2019-07-17 2019-10-30 15:15:22 +01:00
Jan Tojnar
946ef1723b
Merge pull request #62137 from tbenst/pympress
pympress: init at 1.2.0
2019-10-30 15:09:15 +01:00
Tyler Benster
6b9a6f29b7
pympress: init at 1.4.0
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2019-10-30 13:31:02 +01:00
Bart Brouns
0b7c7a6c40 bslizr: init at 1.2.0 2019-10-30 11:30:25 +01:00
zokrezyl
f23870a45b umoci: 0.4.4 2019-10-30 09:43:44 +01:00
Mario Rodas
4ac9b7a9fe
Merge pull request #71799 from marsam/init-node-13_x
nodejs-13_x: init at 13.0.0
2019-10-30 01:44:03 -05:00
Aaron Andersen
722b99beb9
Merge pull request #69342 from Kiwi/matomo-updates
Matomo (module, package) updates
2019-10-29 23:09:27 -04:00
Silvan Mosberger
90e30394f5
go-shadowsocks2: init at 0.0.11 (#67516)
go-shadowsocks2: init at 0.0.11
2019-10-30 01:05:59 +01:00
Dmitry Kalinkin
3328244936
Merge pull request #72037 from kragniz/openrw-2019-10-26
openrw: 2017-09-17 -> 2019-10-26
2019-10-29 16:15:24 -04:00
Dmitry Kalinkin
ddbf53b855
openrw: move cmake to nativeBuildInputs, fix on darwin
Darwin fix as suggested by @risicle
2019-10-29 14:08:29 -04:00
Frederik Rietdijk
860b22f576 libxml2Python: keep using python2
as to not break too much
2019-10-29 19:03:36 +01:00
Maximilian Bosch
f816006191
Merge pull request #72240 from mayflower/wdisplays
wdisplays: init at 2019-10-26-unstable
2019-10-29 18:48:45 +01:00
Linus Heckemann
1bf0d4444c
wdisplays: init at 2019-10-26-unstable 2019-10-29 18:40:18 +01:00
Frederik Rietdijk
ef9f91f3cf Merge staging-next into staging 2019-10-29 16:56:59 +01:00
WilliButz
5330d56c3b
ydotool: init at 0.1.8 2019-10-29 14:43:43 +01:00
WilliButz
dacc4ac680
libuinputplus: init at 2019-10-01 2019-10-29 14:43:43 +01:00
WilliButz
926d6964d9
libevdevplus: init at 2019-10-01 2019-10-29 14:43:43 +01:00
chessai
3519a16e50 libck: init at 0.7.0 2019-10-29 08:47:17 -04:00
Frederik Rietdijk
94e4dd8960 libxslt: use python3 for build and as default for bindings
Changing the default may cause breakage, however, users should have already switched to `pythonPackages.libxslt` long ago.
2019-10-29 13:47:03 +01:00
Frederik Rietdijk
a51aa02c78 libxml2: use python3 for build and as default for bindings
Changing the default may cause breakage, however, users should have
already switched to `pythonPackages.libxml2` long ago.
2019-10-29 13:47:03 +01:00
Maximilian Bosch
5b640bfd08
virtmanager{,-qt}: rename to virt-manager{,-qt}
Both the executable and the derivation's pname are named `virt-manager`,
however the attribute name is named `virtmanager` which is pretty
confusing when e.g. using this package with `nix run`.

Thus I renamed the package accordingly and added aliases for
backwards-compatibility (both attributes aren't used somewhere else
in nixpkgs, so the rename should be fine).

Also several other distros use `virt-manager` as package name like
Arch[1], Debian[2] or Fedora[3].

[1] https://www.archlinux.org/packages/community/any/virt-manager/
[2] https://packages.debian.org/buster/virt-manager
[3] https://apps.fedoraproject.org/packages/virt-manager
2019-10-29 13:34:54 +01:00
chessai
5ac9eed00c forge: init at 1.0.4 2019-10-29 08:09:34 -04:00
Austin Seipp
21c0cc1eee nats-server: rename (from gnatsd), 1.4.0 -> 2.1.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-10-28 21:50:14 -05:00
Austin Seipp
daa2420950 libnats-c: init at 2.1.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-10-28 21:50:14 -05:00
Léo Gaspard
5eb304cc66
Merge pull request #71464 from Ekleog/gir-rs
gir-rs: init at 2019-10-16
2019-10-29 02:31:43 +01:00
worldofpeace
9121c914fc
Merge pull request #54530 from MatrixAI/dvc
dvc: init at 0.24.3
2019-10-29 01:14:50 +00:00
Maximilian Bosch
bd4b70b075
fzf-zsh: init at unstable-2019-09-09
Simple `fzf` wrapper which provides a way nicer interface for ZSH's
<C-r> search. When using oh-my-zsh it can be enabled like this:

``` nix
{ pkgs, ... }: {
  programs.zsh = {
    enable = true;
    ohMyZsh = {
      enable = true;
      customPkgs = [ pkgs.fzf-zsh ];
      plugins = [ "fzf-zsh" ];
    };
  };
}
```
2019-10-28 21:55:34 +01:00
Austin Seipp
f86361d186 vector: init at 0.5.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-10-28 15:03:48 -05:00
Michael Weiss
d8cfa95b76 wob: init at 0.2 2019-10-28 16:56:43 +01:00
Michael Weiss
b60a1b6cfd xob: init at 0.1.1 2019-10-28 16:56:43 +01:00
Marek Mahut
0099870d52
Merge pull request #72122 from primeos/tev
tev: init at 1.13
2019-10-28 13:35:00 +01:00
lumi
ac2d736b3a shotgun: init at 2.2.0 2019-10-27 22:44:07 -07:00
xrelkd
cbeb6570ac firectl: init at 0.1.0 2019-10-27 22:32:58 -07:00
Robert Djubek
cb85d27adc
matomo-beta: init at 3.12.0-b3
Add a beta version of matomo 3.12 that has recent bug fixes. They release these more frequently so it's a good option to have.
2019-10-28 05:11:22 +00:00
Ben Wolsieffer
d44842120e hdf5: don't force GCC 7 (#72124) 2019-10-28 00:04:15 -04:00
Roger Qiu
3c3ac19c43
dvc: init at 0.24.3 2019-10-28 13:07:58 +11:00
Michael Weiss
2e6c509429
tev: init at 1.13 2019-10-27 21:53:45 +01:00
Alexey Shmalko
6f98994415
Merge pull request #71992 from sikmir/mu-repo
mu-repo: init at 1.8.0
2019-10-27 18:02:37 +02:00
Florian Klink
a2f50c02cc
Merge pull request #72082 from JohnAZoidberg/remove-taglib_1_9
taglib_1_9, tomahawk:Remove unmaintained packages
2019-10-27 13:25:44 +01:00
Daniel Schaefer
a3a782ec5f taglib_1_9: Removed, not needed anymore
Was used by, the now removed, tomahawk.
2019-10-27 13:16:53 +01:00
Daniel Schaefer
417c85309d tomahawk: Remove unmaintained broken package
Has been marked broken since 2018 and marked as abandoned upstream since
2017.
2019-10-27 13:16:53 +01:00
Robin Gloster
d06a48139f
riscv-pk-with-kernel: remove
hasn't evaluated sind Nov 2018, due to linux_riscv not existing since
then
2019-10-27 11:44:05 +01:00
Louis Tim Larsen
2896f00181
mythtv: 29.1 -> 30.0 (#71002) 2019-10-27 09:37:44 +01:00
Niklas Hambüchen
3f4bd0e04b elogind: init at 239.5 2019-10-27 02:18:52 +02:00
Timothy DeHerrera
1abe0efa7d
eva: init at 0.2.5 2019-10-26 14:13:51 -06:00
Nikolay Korotkiy
174bb76504
mu-repo: init at 1.8.0 2019-10-26 20:24:51 +03:00
markuskowa
4c0afa1770
Merge pull request #71284 from xfix/zfsbackup-go
zfsbackup: init at unstable-2019-03-05
2019-10-26 19:23:58 +02:00
Aaron Andersen
50e5139893 redmine: drop 3.4.x package 2019-10-26 10:40:16 -04:00
Leon Schuermann
98f0fcf12b tpm2-abrmd: init at 2.2.0 2019-10-26 14:47:20 +02:00
Emery Hemingway
94afe19f93 kf5gpgmepp: init at 16.08.3 2019-10-26 14:42:37 +02:00
Alexey Shmalko
b3675878af
Merge pull request #71981 from Lassulus/vbam
vbam: 2.1.3 -> 2.1.4
2019-10-26 15:17:18 +03:00
Alexey Shmalko
140d402cb5
Merge pull request #71991 from iimog/dcmtk
DCMTK: init at 3.6.4
2019-10-26 15:15:50 +03:00
Gemini Lasswell
3cc9bcb338 yggdrasil: init at 0.3.8 2019-10-26 13:51:31 +02:00
lassulus
b34046859f vbam: 2.1.3 -> 2.1.4 2019-10-26 13:17:17 +02:00
Markus Ankenbrand
905245b32c dcmtk: init at 3.6.4 2019-10-26 13:02:50 +02:00
Renaud
83da13bd25
Merge pull request #71895 from dtzWill/feature/catt
catt: init at 0.10.2
2019-10-25 21:15:15 +02:00
Francesco Gazzetta
7ff539d1d1 shattered-pixel-dungeon: init at 0.7.4c 2019-10-25 20:29:24 +02:00
Frederik Rietdijk
1d7e21905c pipenv: patch pipenv to point to python that has virtualenv 2019-10-25 17:31:51 +02:00
Maximilian Bosch
6db4ae1f27
Merge pull request #70441 from doronbehar/package-gotify-server
gotify-server: init at 2.0.10
2019-10-25 17:10:14 +02:00
Doron Behar
a66e5106fd
gotify-server: init at 2.0.10 2019-10-25 16:19:28 +02:00
Mario Rodas
77a5bf5bfb
Merge pull request #70797 from cfsmp3/master
Added libvmaf + support for it in ffmpeg-full
2019-10-25 09:11:42 -05:00
Gürkan Gür
74f56f4996 vimwiki-markdown: init at 0.2.0 2019-10-25 11:12:22 +02:00
Bas van Dijk
ce14f092ea
Merge pull request #71821 from knl/add-isomd5sum
isomd5sum: init at 1.2.3
2019-10-25 10:15:25 +02:00
Sam Stites
9d90d5fb29 protobuf: add 3.10 2019-10-24 18:51:51 -07:00
Mario Rodas
9e5a30b43e git-backup: init at 0.2.0 2019-10-24 18:50:34 -07:00
scalavision
535a7006ea truvari: init at 1.3.2 (#70877)
pythonPackages.pyvcf: init at 0.6.8
2019-10-24 17:06:42 -04:00
Danielle Lancashire
942eb66bf4 nomad: 0.9.5 -> 0.10.0
This commit upgrades Nomad from 0.9.5 to 0.10.0 and also pins the Golang
version to go1.12 as it is the only supported compiler for the current
release, and due to some dependency issues currently does not support
go1.13.
2019-10-24 08:37:50 -07:00
Robert Hensing
becfba9512
Merge pull request #71092 from roberth/arion-init
arion: init at 0.1.0.0
2019-10-24 16:12:06 +02:00
Florian Klink
dc84a7d4e3
Merge pull request #71291 from NinjaTrappeur/nin-update-acme
simp_le: 0.9.0 -> 0.16.0
2019-10-24 16:08:02 +02:00
Robert Hensing
d3913c84da arion: init at 0.1.0.0 2019-10-24 12:45:07 +02:00
Franz Pletz
3f9774c1d5
Merge pull request #71835 from ruuda/libressl-302
libressl_3_0: 3.0.1 -> 3.0.2
2019-10-24 08:30:10 +00:00
Will Dietz
2bfd58a9cd
catt: init at 0.10.2 2019-10-24 03:25:56 -05:00
Will Dietz
5adf93466d
Merge pull request #71840 from dtzWill/feature/more-bibata
bibata-extra-cursors,bibata-cursors-translucent: init (git revs)
2019-10-24 01:39:04 -05:00
Frederik Rietdijk
32389de159 Merge master into staging-next 2019-10-24 08:27:04 +02:00
Ruud van Asseldonk
671a1182e3 libressl_2_8: remove, not maintained anymore
Stable LibreSSL releases are supported one year after their OpenBSD release.
OpenBSD 6.4 with this branch was released on 2018-10-18.
2019-10-23 21:32:40 +02:00
Ruud van Asseldonk
57c82237de libressl: 2.9.2 -> 3.0.2 2019-10-23 21:30:30 +02:00
Puck Meerburg
9f52dabf79 frozen-bubble: init at 2.212 2019-10-23 18:50:06 +00:00
Will Dietz
be990d5302
bibata-cursors-translucent: init 2019-10-23 12:26:43 -05:00
Will Dietz
06be39a921
bibata-extra-cursors: init at unstable-2018-10-28, more colors 2019-10-23 12:26:42 -05:00
Bjørn Forsman
13859d0bda eagle7: unbreak by using openssl 1.0 instead of 1.1
The default openssl version in nixpkgs is too new for eagle7 and it
fails to start:

  eagle: error while loading shared libraries: libssl.so.1.0.0: cannot open shared object file: No such file or directory
2019-10-23 16:54:12 +02:00
Frederik Rietdijk
09c9a2de7e Merge master into staging-next 2019-10-23 16:50:09 +02:00