Matthew Justin Bauer
2f018d7e68
Merge pull request #38334 from mbode/prometheus_2_2_1
...
prometheus: 2.1.0 -> 2.2.1
2018-04-11 00:24:09 -05:00
Matthew Bauer
0c70c40845
Merge branch 'auto-update/pigz'
2018-04-11 00:17:21 -05:00
Matthew Bauer
11db118623
pigz: fix on darwin
2018-04-11 00:16:17 -05:00
Matthew Justin Bauer
79cd1b5d60
Merge pull request #38474 from Nadrieril/update-ttrss
...
tt-rss: 2018-01-05 -> 2018-04-05
2018-04-11 00:09:53 -05:00
R. RyanTM
a1c7d09564
ipmiutil: 3.0.8 -> 3.0.9
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/ipmiutil/versions .
These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/07c1ae6261a326cebbed6e5e7d24f23b
2018-04-10 21:20:12 -07:00
R. RyanTM
fd8326aaa9
libbson: 1.9.3 -> 1.9.4
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/libbson/versions .
These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.9.4 with grep in /nix/store/120cz3gc3s0hasql1p3zc3sgjzvn4753-libbson-1.9.4
- directory tree listing: https://gist.github.com/da41b1208cf5cb999e6de11ad1fb2fc6
2018-04-10 21:16:58 -07:00
R. RyanTM
29a319dd6e
lldpd: 0.9.9 -> 1.0.1
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/lldpd/versions .
These checks were done:
- built on NixOS
- ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpcli help’ got 0 exit code
- ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpcli -v’ and found version 1.0.1
- ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpctl help’ got 0 exit code
- ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpctl -v’ and found version 1.0.1
- ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpd -v’ and found version 1.0.1
- found 1.0.1 with grep in /nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1
- directory tree listing: https://gist.github.com/932f1a4dc800d742ebb11c348d927eac
2018-04-10 21:08:54 -07:00
Yucheng Zhang
6016d3703d
racket: fix LD_LIBRARY_PATH
2018-04-11 11:59:43 +08:00
adisbladis
2e855dc6b0
kdeconnect: 1.2.1 -> 1.3.0
2018-04-11 10:16:39 +08:00
Matthew Bauer
dd4fd74f91
system_cmds: build more commands
...
Now includes getconf
2018-04-10 21:15:28 -05:00
Matthew Bauer
ec4910d9af
openbsm: init at 1.1
2018-04-10 21:14:56 -05:00
Matthew Bauer
c3f3bc3869
openpam: init at 20170430
2018-04-10 21:14:06 -05:00
Matthew Bauer
6c064e6b1f
Revert "Merge pull request #28029 from cstrahan/hardening-fix"
...
This reverts commit 0dbc0067604eb9629d1458fcf2b226a88e728f14, reversing
changes made to cb7f7742652acdf3086b3d132163b5ea2c2328eb.
Should go into staging.
2018-04-10 19:07:27 -05:00
R. RyanTM
6214e1d82b
librime: 1.3.0 -> 1.3.1
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/librime/versions .
These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.1 with grep in /nix/store/xpam0vd7m94cd2v53szc6y270l3qsp1n-librime-1.3.1
- directory tree listing: https://gist.github.com/52addb8eb8a8dc5778cc5ef320fd6b1e
2018-04-10 16:58:22 -07:00
John Ericson
0dbc006760
Merge pull request #28029 from cstrahan/hardening-fix
...
hardening: fix #18995
2018-04-10 19:48:02 -04:00
R. RyanTM
3d40669548
liquibase: 3.5.5 -> 3.6.0
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/liquibase/versions .
These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.6.0 with grep in /nix/store/q0h0dm35qda3vls6axin875ky93n0idg-liquibase-3.6.0
- directory tree listing: https://gist.github.com/d7568f9f2cd317086e4b519f4749b8d8
2018-04-10 16:35:38 -07:00
R. RyanTM
c26f440524
libcouchbase: 2.8.5 -> 2.8.6
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/libcouchbase/versions .
These checks were done:
- built on NixOS
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-cat --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-create --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-observe --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-observe-seqno --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-incr --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-decr --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-mcflush --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-hash --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-lock --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-unlock --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-rm --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-stats --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-version -h’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-version --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-version help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-verbosity --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-view --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-n1ql --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-admin --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-admin help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-ping --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-create --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-create help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-delete --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-delete help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-flush --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-connstr --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-connstr help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-write-config --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-write-config help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-strerror --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-touch --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-role-list --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-role-list help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-list --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-list help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-upsert --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-delete --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-delete help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-watch --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-pillowfight --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-n1qlback --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-subdoc --help’ got 0 exit code
- ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-proxy --help’ got 0 exit code
- found 2.8.6 with grep in /nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6
- directory tree listing: https://gist.github.com/7a5ce11b6bb1930fe5c10a4f96a9ca79
2018-04-10 16:33:08 -07:00
R. RyanTM
a0fb38174d
ncmpc: 0.29 -> 0.30
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/ncmpc/versions .
These checks were done:
- built on NixOS
- ran ‘/nix/store/2cwvc3ps7jd9bkrdkgkmgn48wdk7yyv4-ncmpc-0.30/bin/ncmpc --help’ got 0 exit code
- found 0.30 with grep in /nix/store/2cwvc3ps7jd9bkrdkgkmgn48wdk7yyv4-ncmpc-0.30
- directory tree listing: https://gist.github.com/07b8bd46db7e01426ba82a0e1dd2b0d0
2018-04-10 16:07:15 -07:00
Tim Steinbach
cb7f774265
minikube: 0.25.2 -> 0.26.0
2018-04-10 18:45:13 -04:00
Tim Steinbach
ee4835add6
htop: 2.1.0 -> 2.2.0
2018-04-10 18:32:27 -04:00
Tim Steinbach
d76725f3a5
docker-edge: 18.03 -> 18.04
2018-04-10 18:28:35 -04:00
Jörg Thalheim
7decb0805e
Merge pull request #38669 from aij/xmrig-proxy-master
...
xmrig-proxy: init at 2.5.2
2018-04-10 23:23:44 +01:00
R. RyanTM
6e066027f5
offlineimap: 7.1.5 -> 7.2.0
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/offlineimap/versions .
These checks were done:
- built on NixOS
- ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/.offlineimap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/.offlineimap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/.offlineimap-wrapped --version’ and found version 7.2.0
- ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/offlineimap -h’ got 0 exit code
- ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/offlineimap --help’ got 0 exit code
- ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/offlineimap --version’ and found version 7.2.0
- found 7.2.0 with grep in /nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0
- directory tree listing: https://gist.github.com/7a051af944742639c585d06d827dabea
2018-04-10 14:51:55 -07:00
John Ericson
ac4d74b6d9
hardening: Reindent
2018-04-10 16:33:47 -04:00
John Ericson
21818ae592
hardening: Tiny reindent
2018-04-10 16:33:47 -04:00
John Ericson
2364c22ec9
hardening: line order, spacing, and pointless quoting for consistency
2018-04-10 16:33:47 -04:00
John Ericson
4c76d87871
hardenning: Rejigger ifs and explicit declare and unset -v
2018-04-10 16:33:47 -04:00
Sander van der Burg
f666e2f412
Merge pull request #38121 from Ma27/package-create-react-native-app
...
nodePackages: add create-{react,react-native}-app; regenerate package set
2018-04-10 22:16:42 +02:00
R. RyanTM
c478b6217f
samtools: 1.7 -> 1.8
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/samtools/versions .
These checks were done:
- built on NixOS
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/samtools --help’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/samtools help’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/blast2sam.pl -h’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/blast2sam.pl --help’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/blast2sam.pl help’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/novo2sam.pl help’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/psl2sam.pl -h’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/psl2sam.pl --help’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/psl2sam.pl help’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/soap2sam.pl -h’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/soap2sam.pl --help’ got 0 exit code
- ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/soap2sam.pl help’ got 0 exit code
- found 1.8 with grep in /nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8
- directory tree listing: https://gist.github.com/4673ea3645eb509035dcb386c4ad1da2
2018-04-10 13:04:09 -07:00
Pascal Wittmann
ac5ed2e0b9
Merge pull request #38699 from r-ryantm/auto-update/synapse
...
synapse: 0.2.99.3 -> 0.2.99.4
2018-04-10 21:53:24 +02:00
Matthew Justin Bauer
04662c1d46
Merge pull request #37737 from srghma/safeeyes
...
safeeyes: init at 2.0.2
2018-04-10 14:35:07 -05:00
Charles Strahan
386e77dae9
hardening: simplify reporting of disabled flags
2018-04-10 15:27:13 -04:00
BjornMelgaard
344c142cda
safeeyes: use wrapGAppsHook
2018-04-10 22:22:33 +03:00
John Boehr
7cb50de416
altcoins.mist: init at 0.10.0
2018-04-10 12:08:33 -07:00
BjornMelgaard
f319b16ab3
safeeyes: add libnotify to deps
2018-04-10 21:57:24 +03:00
BjornMelgaard
35cbab94bc
safeeyes: change quotes
2018-04-10 21:42:50 +03:00
Daniel Frank
e0de2d7ae6
murmur: fix /tmp usage
2018-04-10 20:27:59 +02:00
R. RyanTM
16e37dbc94
synapse: 0.2.99.3 -> 0.2.99.4
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/synapse/versions .
These checks were done:
- built on NixOS
- ran ‘/nix/store/rz2wn4lpkdqhwyz0qk7g41j2ykqmsj1b-synapse-0.2.99.4/bin/synapse -h’ got 0 exit code
- ran ‘/nix/store/rz2wn4lpkdqhwyz0qk7g41j2ykqmsj1b-synapse-0.2.99.4/bin/synapse --help’ got 0 exit code
- found 0.2.99.4 with grep in /nix/store/rz2wn4lpkdqhwyz0qk7g41j2ykqmsj1b-synapse-0.2.99.4
- directory tree listing: https://gist.github.com/77e6334e3c147a4af2d15a9878e112eb
2018-04-10 11:25:06 -07:00
ajs124
7d2e232208
texstudio: 2.12.6 -> 2.12.8 ( #38663 )
...
move to github
2018-04-10 20:19:52 +02:00
BjornMelgaard
46c270c5a6
safeeyes: restart only on failure
2018-04-10 21:19:13 +03:00
BjornMelgaard
def5645ba1
all-packages: fix identation
2018-04-10 21:19:13 +03:00
BjornMelgaard
2f4a220130
safeeyes: add module
2018-04-10 21:19:13 +03:00
BjornMelgaard
3bbe655c44
maintainers: add myself
2018-04-10 21:19:13 +03:00
BjornMelgaard
e00f9b316b
safeeyes: init at 2.0.2
2018-04-10 21:19:13 +03:00
Austin Seipp
d0945011ae
wal-g: 0.1.2 -> 0.1.8pre240_966f3c5f4
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-10 13:10:15 -05:00
Ben Darwin
6908f0ce89
c3d: updated rev still won't compile; mark broken
2018-04-10 13:40:53 -04:00
Ben Darwin
1575136ff2
Merge branch 'minc_ecosystem' of github.com:bcdarwin/nixpkgs into minc_ecosystem
2018-04-10 13:35:39 -04:00
Ben Darwin
efb02d3c00
elastix: 4.8 -> 4.9.0
2018-04-10 13:34:29 -04:00
R. RyanTM
ec0495c032
scantailor-advanced: 1.0.12 -> 1.0.14
...
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/scantailor-advanced/versions .
These checks were done:
- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.14 with grep in /nix/store/idixvv43hjsy4v0xp2mfcryw55wg88c3-scantailor-advanced-1.0.14
- directory tree listing: https://gist.github.com/1f4938c03503cfde35a6b4d10d6538d1
2018-04-10 10:27:18 -07:00
Frederik Rietdijk
6023849ba1
Merge master into staging
2018-04-10 19:23:42 +02:00