Commit Graph

1558 Commits

Author SHA1 Message Date
Michael Fellinger
f92600b406
update versions in Gemfile.lock 2020-04-06 15:02:13 +02:00
Benjamin Hipple
0454fae7ca
Merge pull request #84130 from OmnipotentEntity/rfc45-part2
treewide: quoted urls for RFC45, only the rebuilds
2020-04-05 11:15:20 -04:00
Michael Reilly
e20f308b8e treewide: quoted urls for RFC45, only the rebuilds 2020-04-05 10:17:15 -04:00
Frederik Rietdijk
92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
José Romildo Malaquias
8f9daf0e7b
Merge pull request #84166 from danieldk/softmaker-office-976
softmaker-office: 974 -> 976
2020-04-03 10:05:20 -03:00
Daniël de Kok
cb5580e4c0 softmaker-office: 974 -> 976
This is a bugfix release:

https://www.softmaker.com/en/servicepacks-office-changelog
2020-04-03 09:15:58 +02:00
Daniël de Kok
5e839502c6 softmaker-office: fix desktop items
Fix desktop items to pass validation:

- Remove icon file extension.
- Remove categories that are not defined by the specification.
- Remove a duplicate MIME type in the PlanMaker desktop file
2020-04-03 09:14:16 +02:00
Matthias Beyer
79744be8da fava: 1.13 -> 1.14
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-04-02 13:35:30 +02:00
Ryan Mulligan
6201077d8b
Merge pull request #83983 from r-ryantm/auto-update/khronos
khronos: 1.0.6 -> 1.0.8
2020-04-01 14:02:31 -07:00
R. RyanTM
aa29fa3349 khronos: 1.0.6 -> 1.0.8 2020-04-01 13:47:47 +00:00
worldofpeace
35fcdb5191 elementary-planner: 2.1.1 -> 2.2.14 2020-04-01 01:08:36 -04:00
Jan Tojnar
3e0f4e202f
Merge branch 'master' into staging-next 2020-03-31 21:32:15 +02:00
Nick Hu
4665e31ffd
zotero: make wrapGAppsHook work 2020-03-30 21:03:33 +01:00
Frederik Rietdijk
a36be028f5 Merge staging-next into staging 2020-03-28 21:15:15 +01:00
José Romildo Malaquias
b101527140
Merge pull request #83495 from romildo/upd.freeoffice
freeoffice: 974 -> 976
2020-03-27 20:00:20 -03:00
José Romildo Malaquias
55b6146535 freeoffice: 974 -> 976 2020-03-27 10:37:04 -03:00
Matt McHenry
68e43c61fe timetrap: 1.15.1 -> 1.15.2 2020-03-26 21:21:48 -04:00
Tor Hedin Brønner
253d090786
notes-up: use older vala to fix build
Looks unresolved upstream:
https://github.com/Philip-Scott/Notes-up/issues/349
2020-03-24 07:11:22 +01:00
Benjamin Hipple
ca84a48d7d ledger: remove old version 2.6.3
Version 2.6.3 was released > 5 years ago and has been marked as broken for some
time. It is time to remove it.

This also documents why ledger3 cannot yet build with boost >= 1.67
2020-03-14 17:14:12 -07:00
S. Nordin Abouzahra
0cf9343f08 abiword: 3.0.2 -> 3.0.4
Updates AbiWord to the latest version, patches it to support enchant2, and add
myself to the maintainers list.
2020-03-14 03:36:42 -04:00
Christian Kampka
fb2b3a37aa trilium: 0.40.3 -> 0.40.5 2020-03-13 19:41:16 +00:00
Christian Kampka
667c5c8241 trilium: 0.39.4 -> 0.40.3 2020-03-12 23:51:17 +00:00
Léo Gaspard
4304df2942
Merge pull request #82187 from symphorien/paperwork-update
Paperwork update
2020-03-12 22:16:13 +01:00
José Romildo Malaquias
169fc2eeca
Merge pull request #82038 from danieldk/freeoffice-974
freeoffice: 973 -> 974
2020-03-09 21:27:31 -03:00
Nadrieril
cb9c6a758b paperwork: 1.2.4 -> 1.3.1
Also install paperwork-shell and desktop file
2020-03-09 22:36:55 +01:00
Daniël de Kok
44085e3501 freeoffice: 973 -> 974
Changelog:

https://www.freeoffice.com/en/download/servicepacks
2020-03-08 08:28:13 +01:00
markuskowa
f1c7d10574
Merge pull request #80569 from r-ryantm/auto-update/fava
fava: 1.12 -> 1.13
2020-03-07 16:19:48 +01:00
R. RyanTM
9a2a995a8f zotero: 5.0.82 -> 5.0.83 2020-03-06 07:20:57 +01:00
R. RyanTM
f730d6da49 khronos: 1.0.5 -> 1.0.6 2020-03-05 20:22:27 +00:00
R. RyanTM
5668479498 aesop: 1.2.3 -> 1.2.4 2020-03-01 08:58:30 +00:00
worldofpeace
2a09750de8
Merge pull request #80555 from kjuvi/khronos
khronos: init at 1.0.5
2020-02-29 00:53:45 +00:00
kjuvi
38903decbf khronos: init at 1.0.5 2020-02-28 15:13:05 +01:00
Maximilian Bosch
88f8631de5
Merge pull request #80948 from symphorien/todoman-completions
todoman: install shell completions
2020-02-25 23:21:49 +01:00
Michael Raskin
fcf9e23e73
Merge pull request #80353 from mmilata/libreoffice-spellcheck-dicpath
libreoffice: wrapper: add hunspell dirs to DICPATH
2020-02-25 21:39:11 +00:00
Symphorien Gibol
fb90fea6e8 todoman: install shell completions 2020-02-24 12:00:00 +00:00
R. RyanTM
848a79ae66 fava: 1.12 -> 1.13 2020-02-19 20:49:35 +00:00
Martin Milata
c95bfd235b libreoffice: wrapper: add hunspell dirs to DICPATH
LibreOffice doesn't know where to look for hunspell dictionaries on
NixOS but we can use the DICPATH env var to point to them. Now
spellchecking with system dictionaries works.

Note that some of these dictionaries are built from LibreOffice repos -
this is preferable to building them as part of LO as other applications
can use them.
2020-02-18 14:55:03 +01:00
Michael Raskin
b7b2f31577
Merge pull request #80375 from mmilata/libreoffice-bump-6.4
libreoffice-still: 6.2.6.2 -> 6.3.5.2, libreoffice-fresh: 6.3.0.4 -> 6.4.1.1
2020-02-18 07:59:55 +00:00
Martin Milata
9425bab10a libreoffice-still: 6.2.6.2 -> 6.3.5.2, libreoffice-fresh: 6.3.5.2 -> 6.4.1.1 2020-02-17 22:08:35 +01:00
Martin Milata
f5a5695edd libreoffice-fresh: 6.3.0.4 -> 6.3.5.2 2020-02-17 14:47:54 +01:00
Patrizio Bekerle
66dc93c716 Update QOwnNotes to 20.2.5 2020-02-17 14:36:01 +01:00
Mario Rodas
eb044ecd04
Merge pull request #80150 from r-ryantm/auto-update/atlassian-cli
atlassian-cli: 9.1.0 -> 9.1.1
2020-02-17 08:21:04 -05:00
Daniel Schaefer
8cfd3ea4c0
Merge pull request #80250 from danieldk/softmaker-office-974
softmaker-office: 972 -> 974
2020-02-16 13:43:06 +01:00
R. RyanTM
a4014a71ed homebank: 5.3.1 -> 5.3.2 2020-02-16 09:13:10 +01:00
Daniël de Kok
d4212f7036 softmaker-office: 972 -> 974
Changelog:
https://www.softmaker.com/en/servicepacks-office-changelog
2020-02-16 08:22:43 +01:00
R. RyanTM
2a4402d51a atlassian-cli: 9.1.0 -> 9.1.1 2020-02-15 00:49:00 +00:00
Marek Mahut
18859c8841 grisbi: 1.2.1 -> 1.2.2 2020-02-13 09:02:23 +01:00
Christian Kampka
9205b2d633 trilium: 0.38.2 -> 0.39.4 2020-02-10 20:27:00 +01:00
worldofpeace
89e9f68549
Merge pull request #79585 from Kiwi/scribusUnstable-poppler-0.84
scribusUnstable: Fix build with Poppler 0.84
2020-02-09 09:54:26 -05:00
pasqui23
f9735f05ac
qnotero: 1.0.0 -> 2.1.1 (#74560)
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-02-09 01:40:09 -05:00
Robert Djubek
bef2837579
scribusUnstable: Fix build with Poppler 0.84
see: https://github.com/NixOS/nixpkgs/pull/77186#issuecomment-583800213

it seems poppler updates (almost?) always break scribusUnstable

additionally:
formatted with nixpkgs-fmt;
added kiwi to maintainers - the more eyes the better;
add additional licenses that are listed on scribus COPYING;
2020-02-09 05:20:32 +00:00
Will Dietz
d18b1ee998
Merge pull request #78155 from dtzWill/update/zanshin-0.5.71
zanshin: 2019-07-28 -> 0.5.71
2020-02-03 17:38:20 -06:00
Will Dietz
2158ec610d
elementary-planner: init at 2.1.1 (#78859)
* elementary-planner: init at 2.1.1

* elementary-planner: change pname to match attribute/etc

Upstream doesn't use the name "elementary-planner",
but rename in our packaging and be consistent about it
to avoid confusion with gnome's planner.

* elementary-planner: fetchpatch version fix, dep fixups, maintainers

Per reviewer feedback, thanks all! <3
2020-02-03 13:14:53 -05:00
Will Dietz
6e6a7d61ee
ktimetracker: init at 5.0.1 2020-02-02 14:57:32 -06:00
worldofpeace
f58e59ba7f
Merge pull request #78723 from kjuvi/agenda
agenda: init at 1.0.12
2020-02-01 18:10:01 -05:00
kjuvi
008eb7cb75 agenda: init at 1.0.12 2020-01-31 10:13:31 +01:00
R. RyanTM
f64307a00d tryton: 5.4.1 -> 5.4.2 2020-01-30 22:27:45 -08:00
R. RyanTM
2ff21bdc23 zotero: 5.0.80 -> 5.0.82 2020-01-30 22:07:16 -08:00
R. RyanTM
81b8778507 zim: 0.72.0 -> 0.72.1 2020-01-30 22:06:44 -08:00
worldofpeace
4f1c6789ba aesop: 1.1.3 -> 1.2.3 2020-01-30 21:46:30 -08:00
Will Dietz
ed68721cde
zanshin: 2019-07-28 -> 0.5.71
https://zanshin.kde.org/2020/01/14/zanshin-0.5.71/
2020-01-28 21:59:03 -06:00
Frederik Rietdijk
dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
kjuvi
0c40662294 timetable: 1.0.9 -> 1.1.0 2020-01-27 23:41:19 +01:00
Silvan Mosberger
80a2740991
Merge pull request #78265 from Synthetica9/https-homepages
treewide: fix redirected urls
2020-01-27 15:00:53 +01:00
Aaron Andersen
dfbb444ab4
Merge pull request #78195 from r-ryantm/auto-update/homebank
homebank: 5.2.8 -> 5.3.1
2020-01-25 11:28:04 -05:00
Patrick Hilhorst
593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
R. RyanTM
5cbce718a5 kmymoney: 5.0.7 -> 5.0.8 2020-01-21 16:13:17 -08:00
R. RyanTM
b5b28ec407 homebank: 5.2.8 -> 5.3.1 2020-01-21 18:31:40 +00:00
Lancelot SIX
1102fc870d
pythonPackages.django_2_1: drop
Django-2.1 support ended on December 2, 2019, so drop it in nixpkgs as
well.
2020-01-21 14:00:54 +01:00
Mario Rodas
c7b71bd78d
Merge pull request #78061 from r-ryantm/auto-update/atlassian-cli
atlassian-cli: 9.0.0 -> 9.1.0
2020-01-20 07:34:43 -05:00
R. RyanTM
363840f32d atlassian-cli: 9.0.0 -> 9.1.0 2020-01-20 01:03:40 +00:00
Thomas Marchand
37771e47eb wpsoffice: 11.1.0.8865 -> 11.1.0.9080 2020-01-18 14:18:21 +01:00
worldofpeace
ac96ba0270 skanlite: don't set enableParallelBuilding
it's default on
2020-01-17 13:54:53 -05:00
worldofpeace
4b20959f99 skanlite: use qt5's mkDerivaiton 2020-01-17 13:54:53 -05:00
Frederik Rietdijk
bcd8c6b8dc Merge master into staging-next 2020-01-17 17:08:16 +01:00
Michiel Leenaars
edfbac404b csv2odf: init at 2.09 2020-01-15 22:57:21 -08:00
Anders Kaseorg
3cd8ce3bce treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted.  (See #67234, for
example.)  Fix this throughout the tree.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-15 09:47:03 +01:00
Frederik Rietdijk
5ad16cb27f Merge master into staging-next 2020-01-10 10:34:04 +01:00
Will Dietz
a0b86e3b64
Merge pull request #75022 from dtzWill/update/vnote-2.8
vnote: 2.7.2 -> 2.8.2
2020-01-08 16:03:05 -06:00
Vladimír Čunát
5c780036c5
Merge branch 'master' into staging-next
The nss rebuild isn't so small.
2020-01-08 22:48:13 +01:00
Mario Rodas
f8aeca57c7
Merge pull request #77069 from r-ryantm/auto-update/gnucash
gnucash: 3.7 -> 3.8b
2020-01-08 05:33:04 -05:00
Aaron Andersen
24967c14fc
Merge pull request #66710 from tbenst/tusk
tusk: init at v0.23.0
2020-01-07 20:46:13 -05:00
tbenst
0dd8ee7d0c tusk: init at v0.23.0 2020-01-07 17:06:49 -08:00
Will Dietz
77db935ac3
vnote: 2.8.1 -> 2.8.2 2020-01-07 16:05:23 -06:00
Will Dietz
ee73c91c52
vnote: 2.8 -> 2.8.1 2020-01-07 16:05:11 -06:00
R. RyanTM
289eebc744 gnucash: 3.7 -> 3.8b 2020-01-06 05:32:51 -08:00
Frederik Rietdijk
8fff915659
Merge pull request #76488 from jtojnar/more-python-cleanups
Another batch of Python 2 clean-ups
2020-01-06 12:00:36 +01:00
markuskowa
f3e8be7cd4
Merge pull request #76399 from r-ryantm/auto-update/qownnotes
qownnotes: 19.11.14 -> 19.12.15
2020-01-04 14:07:56 +01:00
Frederik Rietdijk
555037a667 Merge master into staging-next 2019-12-31 16:35:53 +01:00
mlatus
7f6116444b update src url and hash for wpsoffice 2019-12-31 15:14:58 +08:00
Robin Gloster
006242fd5a
treewide: fix types for mkDerivation params 2019-12-31 01:23:19 +01:00
Robin Gloster
755db0b689
treewide: installTargets is a list 2019-12-31 00:25:26 +01:00
Robin Gloster
313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster
f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Jan Tojnar
2093fa784a
libreoffice: fix eval 2019-12-30 20:53:00 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Robin Gloster
371d3fb9b3
notes-up: *Flags are lists 2019-12-30 12:15:24 +01:00
Jan Tojnar
843d147596
gnumeric: switch to python 3 2019-12-29 11:21:09 +01:00
R. RyanTM
e7758b7981 tryton: 5.4.0 -> 5.4.1 2019-12-28 20:30:45 +01:00
Alyssa Ross
53c4668e71
kmymoney: fix build
python2 used to be propagated in here, until
4e421aebfe.

Upstream bug to stop using Python 2:
https://bugs.kde.org/show_bug.cgi?id=405383
2019-12-28 15:46:48 +00:00
Aaron Andersen
dcd5be4af6
Merge pull request #76363 from r-ryantm/auto-update/pympress
pympress: 1.4.0 -> 1.5.1
2019-12-25 06:09:46 -05:00
Aaron Andersen
96e5b691de
Merge pull request #76422 from r-ryantm/auto-update/skrooge
skrooge: 2.21.0 -> 2.21.1
2019-12-24 18:36:07 -05:00
R. RyanTM
c1e301b755 skrooge: 2.21.0 -> 2.21.1 2019-12-24 09:26:22 -08:00
R. RyanTM
f712ed2155 qownnotes: 19.11.14 -> 19.12.15 2019-12-24 05:36:02 -08:00
R. RyanTM
84a23aaec2 pympress: 1.4.0 -> 1.5.1 2019-12-23 22:55:28 -08:00
Marek Mahut
52fb07977e
Merge pull request #76244 from r-ryantm/auto-update/flexibee
flexibee: 2019.3.1.1 -> 2019.3.1.3
2019-12-23 19:38:02 +01:00
R. RyanTM
8c3694a24e flexibee: 2019.3.1.1 -> 2019.3.1.3 2019-12-23 02:04:43 -08:00
Aaron Andersen
086d1ad906
Merge pull request #75047 from kampka/trilium-server
Add trilium server and module
2019-12-22 20:26:57 -05:00
worldofpeace
2dd7d4dd44 treewide: pantheon updateScript 2019-12-22 18:20:55 -05:00
Christian Kampka
ebf3f1fe78
trilium: Pin platforms to x86_64 linux 2019-12-22 15:04:09 +01:00
Oliver Kopp
eb112c8bc3
Fix homepage of JabRef 2019-12-19 21:17:26 +01:00
Christian Kampka
a7db640bf7
trilium: 0.37.8 -> 0.38.2 2019-12-19 10:14:14 +01:00
Christian Kampka
39ecfaf0ba
trilium-server: Add passthru tests 2019-12-19 10:14:14 +01:00
Christian Kampka
1f060b43a6
trilium-server: Patch logger to use console instead of rolling files 2019-12-19 10:14:11 +01:00
Christian Kampka
a84c8599b3
trilium-server: init at 0.37.8 2019-12-19 10:14:10 +01:00
Christian Kampka
184339fe8b
trilium: Rename package to trilium-desktop 2019-12-19 10:14:09 +01:00
Christian Kampka
fa851fd7a8
trilium: 0.33.6 -> 0.37.8 2019-12-19 10:14:08 +01:00
Martin Milata
737ce5c848 libreoffice: factor out common derivation
Each "variant" of libreoffice gets its own subdirectory src-$variant
where files w/ source references are stored. In the directory is also
override.nix which allows you to override derivation attributes in
addition to source files.
2019-12-18 13:23:34 +01:00
worldofpeace
1d8ef857ee aesop: fix build
See https://github.com/lainsce/aesop/pull/33
2019-12-15 00:45:38 -05:00
Yannis Koutras
295d8bae7a
Merge pull request #75050 from alapshin/feature/skroge-2.21.0
skrooge: 2.20.0 -> 2.21.0
2019-12-14 14:14:10 +01:00
worldofpeace
0ea42c7af6 tryton: 4.8.5 -> 5.4.0
Uses python3, no more pygtk.
2019-12-10 22:38:21 -05:00
Marek Mahut
dd33d4d4aa
Merge pull request #75216 from r-ryantm/auto-update/flexibee
flexibee: 2019.3.0.7 -> 2019.3.1.1
2019-12-10 22:44:01 +01:00
markuskowa
2e44944de5
Merge pull request #75407 from r-ryantm/auto-update/zotero
zotero: 5.0.77 -> 5.0.80
2019-12-10 21:39:33 +01:00
Pascal Wittmann
09dec10524
Merge pull request #74829 from tenaf0/zim-fix
zim: Fix missing icons
2019-12-10 08:47:11 +01:00
R. RyanTM
58e9e03700 zotero: 5.0.77 -> 5.0.80 2019-12-09 16:04:56 -08:00
R. RyanTM
f73f46c66f
fava: 1.11 -> 1.12 2019-12-07 23:45:59 -08:00
c0bw3b
69b393ace5 Treewide: update some problematic homepages
These URLs are reported as problematic by Repology.
It could be a permanent redirection
or the page does not exist anymore
2019-12-08 10:21:29 -08:00
R. RyanTM
401655ed83 flexibee: 2019.3.0.7 -> 2019.3.1.1 2019-12-07 22:44:17 -08:00
worldofpeace
0c8dadd9e5
Merge pull request #75040 from worldofpeace/remove-terror-webkitgtk
🙈️ Remove webkitgtk24x
2019-12-06 22:02:50 -05:00
Will Dietz
456d826c1d
Merge pull request #73776 from dtzWill/update/minetime-1.7.1
minetime: 1.5.1 -> 1.7.3, patch scheduling service util
2019-12-06 03:22:51 -06:00
Will Dietz
c997aca310
minetime: 1.7.2 -> 1.7.3 2019-12-06 02:49:56 -06:00
Andrei Lapshin
0b05c612be skrooge: 2.20.0 -> 2.21.0
Update to new upstream version
2019-12-05 18:49:36 +03:00
worldofpeace
f9deadf01c mmex: use gtk3 wxGTK 2019-12-05 07:01:29 -05:00
Will Dietz
8d81287790
vnote: 2.7.2 -> 2.8 2019-12-04 22:07:58 -06:00
Will Dietz
4cfe67f104
minetime: 1.7.1 -> 1.7.2 2019-12-04 22:06:37 -06:00
Jan Tojnar
a46fa21e43
scribusUnstable: Fix build with Poppler 0.83
Another fallout from https://github.com/NixOS/nixpkgs/pull/74558
2019-12-04 23:02:30 +01:00
Jan Tojnar
b6284fd70f
libreoffice: use external Poppler 0.83 patch 2019-12-04 13:22:50 +01:00
Martin Milata
7f1bf286dc libreoffice: fix build with poppler-0.83 2019-12-04 03:19:29 +01:00
Jan Tojnar
da04dee9c0
bookworm: fix eval with allowAliases = false 2019-12-03 01:57:38 +01:00
Ninlives
9974c07915 wpsoffice: 10.1.0.5672 -> 11.1.0.8865 (#74769) 2019-12-02 16:23:52 +00:00
Garaba Flórián
d28fcaad96 zim: Fix missing icons 2019-12-02 13:06:23 +01:00
Michael Raskin
5663e39390
Merge pull request #74478 from malbarbo/libreoffice-pt
libreoffice: add portuguese language support
2019-12-01 11:26:24 +00:00
Jan Tojnar
8cbc862b83
dconf: move to top-level 2019-12-01 01:01:40 +01:00
Marco A L Barbosa
45dc8d0617 libreoffice: add portuguese language support 2019-11-28 09:09:13 -03:00
Frederik Rietdijk
1d18c5a0fe Merge staging-next into staging 2019-11-24 10:13:31 +01:00
worldofpeace
3575bd5e2e aesop: 1.1.2 -> 1.1.3
https://github.com/lainsce/aesop/releases/tag/1.1.3
2019-11-21 08:36:21 -05:00
Martin Milata
879c47c82a libreoffice: add dev output with headers 2019-11-21 03:13:48 +01:00
José Romildo Malaquias
d9a6c04e0f
Merge pull request #73704 from romildo/upd.softmaker-office
freeoffice: 971 -> 973
2019-11-20 06:20:50 -03:00
Frederik Rietdijk
10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk
65edeb8633 Merge master into staging-next 2019-11-20 10:01:49 +01:00