Jan Tojnar
db16b93039
ostree: 2017.9 → 2017.12
2017-11-05 20:44:13 +01:00
Jan Tojnar
05562d9237
networkmanagerapplet: cleanup
2017-11-05 20:44:09 +01:00
Orivej Desh
40e47e3fb3
Merge pull request #30898 from iblech/nat-traverse
...
nat-traverse: init at 0.7
2017-11-05 18:35:36 +00:00
Orivej Desh
080092ffa7
nat-traverse: do not wrap with perl path
2017-11-05 18:10:48 +00:00
Jan Tojnar
2dfa36233d
sshfs-fuse: remove unneeded rpath wrapping
2017-11-05 19:53:48 +02:00
Orivej Desh
2240e8055a
Merge pull request #31286 from rnhmjoj/masscan
...
masscan: 2017-02-04 -> 1.0.4
2017-11-05 17:51:30 +00:00
rnhmjoj
de1e0ee43f
masscan: 2017-02-04 -> 1.0.4
2017-11-05 18:22:17 +01:00
Orivej Desh
dcf16a83fe
Merge pull request #31277 from rnhmjoj/bdf2psf
...
bdf2psf 1.158 -> 1.170
2017-11-05 17:03:14 +00:00
rnhmjoj
c47ac4d2ad
ddcutil: 0.8.2 -> 0.8.4
2017-11-05 17:51:32 +01:00
Jan Tojnar
1d55dd3d13
fwup: 0.14.3 → 0.16.1
2017-11-05 17:02:29 +01:00
rnhmjoj
8877ba4c0f
bdf2psf 1.158 -> 1.170
2017-11-05 15:41:13 +01:00
Franz Pletz
91de9958c0
browserpass: 1.0.6 -> 2.0.7
2017-11-05 14:55:51 +01:00
Sander van der Burg
51536b2df7
Merge pull request #31235 from Ma27/statsd-with-node2nix
...
statsd: repackage with node2nix
2017-11-05 13:46:03 +01:00
Michael Weiss
af3a11b8f6
pgpdump: Add support for compressed data packets
...
This will add support for compressed data packets (Tag 8) [0] and enable
it by default.
[0]: https://tools.ietf.org/html/rfc4880#section-5.6
2017-11-04 21:23:14 +01:00
Renaud
9754503c6b
nsjail: 2.1 -> 2.2
...
plus fixed meta.license which should be Apache License 2.0
2017-11-04 20:02:23 +01:00
mimadrid
25f080ca4a
gawk: 4.1.4 -> 4.2.0
2017-11-04 17:29:35 +01:00
Tuomas Tynkkynen
61f3d46fcf
Merge remote-tracking branch 'upstream/master' into staging
2017-11-04 17:47:54 +02:00
Tim Steinbach
a789f5b2f1
Merge pull request #31233 from mimadrid/update/rofi-pass-1.5.3
...
rofi-pass: 1.5.2 -> 1.5.3
2017-11-04 11:04:41 -04:00
Tim Steinbach
21b587a6dd
Merge pull request #31232 from mimadrid/update/tmuxp-1.3.4
...
tmuxp: 1.3.1 -> 1.3.4
2017-11-04 10:58:27 -04:00
mimadrid
9720703d24
mawk: 1.3.4-20161120 -> 1.3.4-20171017
2017-11-04 15:56:31 +01:00
Tim Steinbach
aab92cba7d
Merge pull request #31243 from pbogdan/tcpflow-fix-build
...
tcpflow: fix build
2017-11-04 10:42:18 -04:00
Piotr Bogdan
adf5aea0b6
tcpflow: fix build
2017-11-04 12:45:59 +00:00
Michael Raskin
cc3c38d788
Merge pull request #31238 from c0bw3b/pkg/fdm
...
fdm: 1.8 -> 1.9.0.20170124
2017-11-04 12:36:06 +00:00
Renaud
5fe398fdc9
fdm: 1.8 -> 1.9.0.20170124
...
sf.net repo does not exist anymore
2017-11-04 13:27:39 +01:00
Daiderd Jordan
0d95b319c0
Merge pull request #31234 from mimadrid/update/rlwrap-0.43
...
rlwrap: 0.42 -> 0.43
2017-11-04 11:56:19 +01:00
Daiderd Jordan
7ada6b5ad2
Merge pull request #31229 from mimadrid/update/fzf-0.17.1
...
fzf: 0.17.1
2017-11-04 11:50:19 +01:00
mimadrid
b34f5db38f
parallel: 20170722 -> 20171022
2017-11-04 11:29:40 +01:00
Vladimír Čunát
eed6e0a946
Merge branch 'master' into staging
...
Lots of rebuilds from master; at least some of them due to security.
2017-11-04 10:28:00 +01:00
Maximilian Bosch
5633431c2b
statsd: repackage with node2nix
2017-11-04 10:23:28 +01:00
mimadrid
97d251e6ac
rofi-pass: 1.5.2 -> 1.5.3
2017-11-04 09:31:18 +01:00
mimadrid
c375ed9b86
rlwrap: 0.42 -> 0.43
2017-11-04 09:29:49 +01:00
mimadrid
16172d4299
fzf: 0.17.1
2017-11-04 08:36:33 +01:00
mimadrid
765091d80b
tmuxp: 1.3.1 -> 1.3.4
2017-11-04 08:25:03 +01:00
Jörg Thalheim
3328e35af8
Merge pull request #30987 from wizeman/u/fix-openntpd-cert
...
openntpd: fix constraints feature on NixOS
2017-11-03 22:36:19 +00:00
Tuomas Tynkkynen
d2717a55d9
ethtool: 4.11 -> 4.13
2017-11-03 21:25:41 +02:00
Orivej Desh
3463add6c5
Merge pull request #31203 from mimadrid/update/zstd-1.3.2
...
zstd: 1.3.0 -> 1.3.2
2017-11-03 19:21:44 +00:00
Orivej Desh
43d4ebbb0a
Merge pull request #30846 from c0bw3b/pkg/Gcode
...
treewide: abandon Google Code homepages
2017-11-03 19:10:06 +00:00
mimadrid
8e982d5f2e
zstd: 1.3.0 -> 1.3.2
2017-11-03 19:58:01 +01:00
c0bw3b
525380b472
treewide: abandon Google Code homepages
2017-11-03 18:52:28 +00:00
Frederik Rietdijk
2c822b16fb
Merge pull request #30880 from orivej/nix-unstable
...
nixUnstable: rename to nix-unstable
2017-11-03 19:21:36 +01:00
Orivej Desh
1729e9ea25
Merge pull request #31186 from mimadrid/update/xarchiver-0.5.4.12
...
xarchiver: 0.5.4.7 -> 0.5.4.12
2017-11-03 16:00:28 +00:00
Orivej Desh
4762689a8a
Merge pull request #31193 from pbogdan/reaverwps-t6x-fix-build
...
reaverwps-t6x: fix build
2017-11-03 15:39:50 +00:00
Samuel Leathers
9f85fc52b8
Merge pull request #31195 from pbogdan/curl-unix-socket-fix-build
...
curl-unix-socket: fix build
2017-11-03 11:25:47 -04:00
Piotr Bogdan
5a539f5eb5
curl-unix-socket: fix build
2017-11-03 14:43:11 +00:00
Piotr Bogdan
16c69270ae
reaverwps-t6x: fix build
2017-11-03 14:36:15 +00:00
mimadrid
8ee4a3648f
xarchiver: 0.5.4.7 -> 0.5.4.12
...
- Fix github url
- Add libxslt dependency
- Gtk2 -> Gtk3
2017-11-03 14:25:01 +01:00
makefu
1774cc04cb
snapraid: fix release checksum
2017-11-03 09:12:30 +01:00
Jörg Thalheim
90c92918f1
Merge pull request #31151 from lheckemann/vboot-update
...
vboot_reference: 20130507 -> 20171023
2017-11-03 00:23:57 +00:00
Orivej Desh
9caf89c903
Merge pull request #31164 from c0bw3b/pkg/htpdate
...
htpdate: 1.1.3 -> 1.2.0
2017-11-03 00:02:08 +00:00
Orivej Desh
c0a0d8b651
Merge pull request #31108 from benley/openvpn-auth-ldap
...
openvpn-auth-ldap: init at 2.0.3
2017-11-03 00:00:52 +00:00
Orivej Desh
66683883ca
Merge pull request #31142 from adisbladis/rpm-4_14_0
...
rpm: 4.13.0.1 -> 4.14.0
2017-11-02 23:49:06 +00:00
Joerg Thalheim
0433604f51
mitmproxy: 2.0.2 -> 2017-10-31
2017-11-02 23:46:55 +00:00
Renaud
6d80920ab9
htpdate: 1.1.3 -> 1.2.0
2017-11-03 00:21:16 +01:00
Ruben Maher
47c000b894
awsebcli: 3.11.0 -> 3.12.0
2017-11-03 09:38:16 +10:30
Ruben Maher
fcf0df2cf6
awsebcli: tiny whitespace fix
2017-11-03 09:38:16 +10:30
Ruben Maher
054baf2cbe
awsebcli: unbreak after cement update
...
awsebcli requests that the cement package be exactly at version 2.8.2 and won't
build without it.
2017-11-03 09:38:15 +10:30
Linus Heckemann
454c42c849
vboot_reference: Update
...
In addition to updating to a more recent upstream version, this
installs the development signing keys and removes the separate
vbutil_* tools in favour of the single futility tool.
2017-11-02 20:11:45 +00:00
Benjamin Staffin
998027a531
openvpn-auth-ldap: init at 2.0.3
2017-11-02 14:35:48 -04:00
adisbladis
9fa8f3ed0d
rpm: 4.13.0.1 -> 4.14.0
2017-11-03 02:07:38 +08:00
Casey Ransom
b62992a483
kisslicer: init at 1.6.2
2017-11-02 18:01:18 +01:00
Piotr Bogdan
8904ce343a
fix source root locations.
...
These have changed following commit
c3255fe8ec
.
See also:
- https://github.com/NixOS/nixpkgs/pull/31004
- https://github.com/NixOS/nixpkgs/pull/31106
2017-11-02 13:53:36 +00:00
zimbatm
c34c737172
Merge pull request #31100 from zimbatm/hashcat4
...
Hashcat4
2017-11-02 11:23:07 +00:00
Jörg Thalheim
6a61a78f4b
Merge pull request #31085 from peterromfeldhk/fastlane
...
fastlane: 2.62.1 -> 2.63.0
2017-11-02 08:50:12 +00:00
Jörg Thalheim
455ab9ff51
Merge pull request #31091 from c0bw3b/pkg/hardlink
...
hardlink: 2012.9.3ec908d539 --> 1.3-4
2017-11-02 08:34:29 +00:00
Peter Hoeg
cf7d701108
unetbootin: 655 -> 657 and make it build again
2017-11-02 13:25:12 +08:00
adisbladis
ef97adf60c
fpm: 1.6.2 -> 1.9.3
2017-11-02 10:22:51 +08:00
Mateusz Kowalczyk
e1d7f7ba82
cloc: fix sourceRoot
2017-11-01 21:41:18 +00:00
Renaud
a66f1d6047
rdfind: 1.3.4 -> 1.3.5
...
homepage and fetch src over HTTPS
2017-11-01 22:23:27 +01:00
zimbatm
f4e38223f3
google-cloud-sdk: 171.0.0 -> 177.0.0
2017-11-01 20:33:23 +00:00
zimbatm
81baa25fd1
gifsicle: 1.88 -> 1.90
2017-11-01 20:25:50 +00:00
zimbatm
a209f56d6d
hashcat: 2.00 -> 4.0.0
...
remove 3.6.0 which was not the default
2017-11-01 15:06:06 +00:00
Renaud
17de809fb8
hardlink: 2012.9.3ec908d539 --> 1.3-4
2017-11-01 15:08:25 +01:00
Peter Romfeld
04b3b00917
fastlane: 2.62.1 -> 2.63.0
2017-11-01 20:26:14 +08:00
Vladimír Čunát
06d7e54d62
Merge branch 'staging'
...
- I can see some regressions, especially due to fetchzip rename c3255fe8ec
.
- Darwin is only half-rebuilt on Hydra ATM.
- But there quite a few security fixes within.
2017-11-01 08:37:31 +01:00
Orivej Desh
26e4f6f4f8
Merge pull request #30980 from wizeman/u/fix-cjdns-hash
...
cjdns: fix hash
2017-11-01 04:32:21 +00:00
Orivej Desh
34cd077686
Merge pull request #30981 from wizeman/u/fix-ibus-emoji-hash
...
ibus: fix emoji hashes
2017-11-01 02:16:49 +00:00
Vladimír Čunát
447802a683
Merge branch 'master' into staging
2017-10-31 23:47:34 +01:00
Vladimír Čunát
ff437fca45
scrot: 0.8-17 -> 0.8-18
...
The old patch-set isn't available on Debian anymore.
Uncovered by c3255fe8ec
.
2017-10-31 23:40:27 +01:00
Vladimír Čunát
947d48cdaf
9pfs: fix src download
...
Fortunately the hash is the same, so I don't really need to check
authenticity. Uncovered by c3255fe8ec
.
2017-10-31 23:11:23 +01:00
Théo Zimmermann
6798212571
languagetool: add command for HTTP server
2017-10-31 21:08:56 +01:00
Orivej Desh
6e02ddc926
Merge pull request #31041 from matthiasbeyer/update-my-packages
...
Update a few packages
2017-10-31 17:21:00 +00:00
Michael Weiss
8e91f4ea91
lf: 2017-09-06 -> 2017-10-30
2017-10-31 16:56:40 +01:00
Matthias Beyer
713a7b65e7
vdirsyncer: 0.15.0 -> 0.16.3
2017-10-31 16:27:23 +01:00
Matthias Beyer
cc9431fee2
http-prompt: 0.10.2 -> 0.11.0
2017-10-31 16:27:23 +01:00
Peter Hoeg
369056394f
Merge pull request #31020 from peterhoeg/p/mht
...
mht2htm: init at 1.8.1.35
2017-10-31 22:08:07 +08:00
Peter Hoeg
12da0b5f45
mht2htm: init at 1.8.1.35
2017-10-31 22:07:23 +08:00
Aaron Bull Schaefer
16e9541169
ansible: 2.4.0.0 -> 2.4.1.0
2017-10-30 16:09:40 -07:00
Vladimír Čunát
687943763c
Merge branch 'master' into staging
2017-10-30 22:30:14 +01:00
Jörg Thalheim
e2edccae47
Merge pull request #31005 from sengaya/update-pwgen-2.08
...
pwgen: 2.07 -> 2.08
2017-10-30 21:25:29 +00:00
Jörg Thalheim
7d04f9f8fd
Merge pull request #31002 from yegortimoshenko/bchunk/CVE-2017-15953
...
bchunk: fix recent CVEs, simplify installPhase
2017-10-30 21:20:55 +00:00
Thilo Uttendorfer
61aeeb50ab
pwgen: 2.07 -> 2.08
2017-10-30 22:19:11 +01:00
Yegor Timoshenko
94b7368eef
bchunk: fix recent CVEs, simplify installPhase
...
For details, see:
https://bugs.gentoo.org/635898
https://nvd.nist.gov/vuln/detail/CVE-2017-15953
https://nvd.nist.gov/vuln/detail/CVE-2017-15954
https://nvd.nist.gov/vuln/detail/CVE-2017-15955
https://github.com/extramaster/bchunk/issues/2
https://github.com/extramaster/bchunk/issues/3
https://github.com/extramaster/bchunk/issues/4
2017-10-30 20:20:01 +00:00
Ricardo M. Correia
7bd64e3dee
cjdns: fix hash
...
.. and switch to fetchFromGitHub to avoid future hash changes.
2017-10-30 19:05:18 +01:00
Ricardo M. Correia
f7616c4f5e
openntpd: fix constraints feature on NixOS
...
The OpenNTPD constraints feature requires a valid chain of SSL
certificates, but the default path in openntpd didn't match the one in
NixOS.
Unfortunately the configured certificate path becomes hardcoded into the
binary, so this feature will likely still fail on other
distributions/operating systems, unless the path coincides with the
NixOS path or the user sets up a symlink.
2017-10-30 18:42:02 +01:00
Ricardo M. Correia
bfbe560411
ibus: fix emoji hashes
2017-10-30 17:57:37 +01:00
WilliButz
367a3e45fd
highlight: 3.39 -> 3.40, fetch src from Github
2017-10-30 14:44:41 +01:00
Frederik Rietdijk
6d41ae55dd
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-30 07:51:09 +01:00
Frederik Rietdijk
f04f30fd2d
Merge pull request #30921 from andir/vdirsyncer-requests_oauthlib
...
vdirsyncer: added requests_oauthlib to propagatedBuildInputs
2017-10-29 18:28:55 +01:00
Christian Kauhaus
afc66e121d
vulnix: 1.2.2 -> 1.3.4
...
The build needs the ZODB fix in PR #30925 to succeed.
2017-10-29 15:43:58 +01:00
Frederik Rietdijk
d0d0308876
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-29 14:08:20 +01:00
Frederik Rietdijk
bd7074961a
Merge pull request #30897 from flokli/borgbackup-ssh
...
borgbackup: fix ssh binary location
2017-10-29 12:16:19 +01:00
Andreas Rammhold
335add9e0c
vdirsyncer: added requests_oauthlib to propagatedBuildInputs
...
vdirsyncer requires `requests_oauthlib` in order to work with google
calendar sync services
2017-10-29 11:41:49 +01:00
Rob Vermaas
0767d2984b
nixops: update to 1.5.2
...
(cherry picked from commit c291a10776
)
2017-10-29 10:24:53 +01:00
Florian Klink
f3b311af44
borgbackup: fix ssh binary location
...
Otherwise, borg might be unable to find its location
2017-10-28 22:05:45 +02:00
Florian Klink
08e06e7d22
borgbackup: add flokli as maintainer
2017-10-28 22:05:37 +02:00
Andreas Rammhold
036f9ec235
ecdsautils: init 0.4.0
2017-10-28 17:41:34 +02:00
Ingo Blechschmidt
a71e80db8b
nat-traverse: init at 0.7
2017-10-28 16:42:40 +02:00
Herwig Hochleitner
5eccf40eb4
i2p: 0.9.30 -> 0.9.31
2017-10-28 14:51:58 +02:00
Jörg Thalheim
a83e71900b
Merge pull request #30840 from dywedir/fd
...
fd: 4.0.0 -> 5.0.0
2017-10-28 13:31:33 +01:00
Joachim F
1f966e93f6
Merge pull request #30759 from FlorentBecker/pptp_route
...
pptp: correct reference to ${iproute}/bin/ip
2017-10-28 11:31:57 +00:00
Yuri Aisaka
ad1bf41391
skktools: init at 1.3.3 ( #30778 )
2017-10-28 11:23:42 +00:00
Jörg Thalheim
330b4336bd
Merge pull request #30848 from peterromfeldhk/fastlane
...
fastlane: 2.61.0 -> 2.62.1
2017-10-28 11:56:28 +01:00
mimadrid
01e47d6bb5
arp-scan: fix homepage url
2017-10-28 11:18:25 +02:00
Frederik Rietdijk
cf5ebcf395
Merge pull request #30879 from iblech/sshlatex
...
sshlatex: init at 0.7
2017-10-28 11:13:53 +02:00
mimadrid
817d51aa8f
a2ps: fix homepage url
2017-10-28 11:10:45 +02:00
Ingo Blechschmidt
9f28f2dd38
sshlatex: init at 0.7
2017-10-28 11:08:05 +02:00
adisbladis
b972139a59
dpkg: 1.18.24 -> 1.19.0.4 ( #30854 )
...
* dpkg: 1.18.24 -> 1.19.0.4
* dpkg: just use one substituteInPlace call
2017-10-28 10:07:43 +01:00
adisbladis
2da692dfc1
unbound: 1.6.6 -> 1.6.7
2017-10-28 10:29:17 +02:00
Frederik Rietdijk
9016e04970
Merge pull request #30874 from leenaars/datefudge
...
datefudge: 1.21 => 1.22
2017-10-28 10:23:36 +02:00
Frederik Rietdijk
2d88c366fc
Merge pull request #30829 from jfrankenau/update-borg
...
borgbackup: 1.1.0 -> 1.1.1
2017-10-28 08:52:27 +02:00
Orivej Desh
9711aac642
nixUnstable: rename to nix-unstable
2017-10-27 23:05:12 +00:00
Michiel Leenaars
0c6afc94bc
datefudge: 1.21 => 1.22
2017-10-27 22:22:33 +02:00
Frederik Rietdijk
8634a2e2c5
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-27 21:35:58 +02:00
Franz Pletz
3e29dd00fc
wget: 1.19.1 -> 1.19.2 for multiple CVEs
...
Fixes CVE-2017-13089, CVE-2017-13090.
2017-10-27 11:58:50 +02:00
Edward Tjörnhammar
0e4be9e5f0
bully: 1.0-22 -> 1.1
2017-10-27 09:03:44 +02:00
Peter Romfeld
21ad5f0ab6
fastlane: 2.61.0 -> 2.62.1
2017-10-27 11:13:43 +08:00
Graham Christensen
0f5eaaf1e9
Merge pull request #30810 from puffnfresh/package/jsawk
...
jsawk: init at 1.5-pre
2017-10-26 19:29:45 -04:00
Brian McKenna
b72fcce2d9
jsawk: init at 1.5-pre
2017-10-27 09:55:57 +11:00
dywedir
e61ef03c02
fd: 4.0.0 -> 5.0.0
2017-10-27 00:08:49 +03:00
Joachim Fasting
5a64e446ff
tor: 0.3.1.7 -> 0.3.1.8
...
Quoth the release notes:
> It includes several bugfixes, including a bugfix for a crash issue that
had affected relays under memory pressure. It also adds a new directory
authority, Bastet.
2017-10-26 22:39:24 +02:00
Johannes Frankenau
8f3a2d6991
borgbackup: 1.1.0 -> 1.1.1
2017-10-26 17:14:23 +02:00
Daiderd Jordan
31db63bd74
Merge pull request #30809 from andir/dnstracer-darwin
...
dnstracer: fix build on darwin
2017-10-26 11:30:24 +02:00
Michael Weiss
6951604011
sshfs: 3.3.0 -> 3.3.1
2017-10-26 07:58:57 +02:00
Andreas Rammhold
32d6259eec
dnstracer: fix build on darwin
2017-10-26 01:56:19 +02:00
Joerg Thalheim
1e3995d3ea
svgcleaner: add correct license
2017-10-26 00:02:45 +01:00
Jörg Thalheim
6a2dc55337
Merge pull request #30803 from elasticdog/ansible_2_3
...
ansible_2_3: 2.3.1.0 -> 2.3.2.0
2017-10-25 20:48:11 +01:00
Aaron Bull Schaefer
19fda23a50
ansible_2_3: 2.3.1.0 -> 2.3.2.0
2017-10-25 12:23:52 -07:00
Jörg Thalheim
68fced26d8
Merge pull request #30799 from mehandes/svgcleaner
...
svgcleaner: init at v0.9.1
2017-10-25 19:52:49 +01:00
mehandes
17af9f8d4d
svgcleaner: init at v0.9.1
...
Svgcleaner is a tool for fast and safe svg optymalization.
2017-10-25 18:43:10 +02:00
Tuomas Tynkkynen
1cea1b66a4
ding-libs: 0.6.0 -> 0.6.1
2017-10-25 19:36:30 +03:00
Tuomas Tynkkynen
e94887bb11
fio: 2.99 -> 3.1
2017-10-25 19:36:30 +03:00
Tuomas Tynkkynen
e85768b0df
xfsprogs: 4.11.0 -> 4.13.1
2017-10-25 19:36:30 +03:00
Tuomas Tynkkynen
8c9dbb2d39
gptfdisk: 1.0.1 -> 1.0.3
2017-10-25 19:36:30 +03:00
Franz Pletz
eb3332ef40
Merge pull request #30644 from woffs/pulsemixer
...
pulsemixer: init at 1.3.0-license
2017-10-25 10:32:07 +02:00
Franz Pletz
6df1cccfdf
Merge pull request #30721 from xzfc/xpointerbarrier
...
xpointerbarrier: init at 17.10
2017-10-25 04:11:52 +02:00
José Romildo Malaquias
a76a3cab01
avfs: 1.0.4 -> 1.0.5
2017-10-24 16:34:08 -02:00
mimadrid
9b7bf9cd91
rofi-pass: 1.5.1 -> 1.5.2
2017-10-24 18:22:12 +02:00
Utku Demir
cf8e966e00
lastpass-cli: 1.1.1 -> 1.2.1
2017-10-24 17:34:51 +02:00
Frank Doepper
4936e31141
pulsemixer: init at 1.3.0-license
2017-10-24 16:53:15 +02:00
Franz Pletz
89640746b5
Merge branch 'master' into staging
2017-10-24 16:07:49 +02:00