diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-17 05:35:09 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-17 05:35:09 +0000 |
| commit | d99a2fc093c1bffd41f0008689cd2be4f1b7dea6 (patch) | |
| tree | 827becf0bb8f449b71439a22a1746698eb175612 | |
| parent | 020a6663d319c7b4af5c0219bc451abdac12f62a (diff) | |
| parent | 3ac474aee6ac977f67fa4ffd35da8af56df5fba8 (diff) | |
Merge branch 'master' into staging
* master: (293 commits)
go_1_9: skip flaky TestServerCancelsReadTimeoutWhenIdle
qsyncthingtray: fix build
qt56.qtwebengine: fix build
stdman: d860212 -> 2017.04.02
jackett: use mono50
hg-git: disable with python3
hg-git: 0.8.5 -> 0.8.10
xfce4-settings: enable parallel building
gcc-snapshot: mark as broken
heaptrack: 2017-02-14 -> 2017-10-30
nixos-container: Modify existing test to cover show-ip command
nixos-container: Make show-ip work together with ipv4 + netmask
linux-copperhead: 4.13.12.a -> 4.13.13.a
matterbridge: 1.1.0 -> 1.4.1
nixos/nghttpx: add module for the nghttpx proxy server (#31680)
mattermost: 4.3.0 -> 4.4.0
breakpad: delete
simp_le: 0.2.0 -> 0.6.1
certbot: 0.11.1 -> 0.19.0
afl: 2.51b -> 2.52b
...