[Git][debian-proftpd-team/proftpd][buster] 2 commits: Follow buster-security (1.3.6-4+deb10u4).

[Hilmar Preuße]

Hilmar Preuße pushed to branch buster at Debian ProFTPD Team / proftpd


Commits:
f1c0cf4a by Hilmar Preusse at 2020-03-03T23:34:29+01:00
Follow buster-security (1.3.6-4+deb10u4).

- - - - -
136d6658 by Hilmar Preusse at 2020-04-27T15:11:27+02:00
Merge branch 'buster-security' into buster

- - - - -


1 changed file:

- debian/patches/series


Changes:

=====================================
debian/patches/series
=====================================
@@ -22,5 +22,8 @@ bug_846_CVE-2019-18217.patch
 upstream_pull_859_861_CVE-2019-19270_CVE-2019-19269
 Issue-903-Ensure-that-we-do-not-reuse-already-destro.patch
 Issue-903-We-want-to-remove-the-data-transfer-comman.patch
+<<<<<<< HEAD
 upstream_pull_657
 upstream_pull_885
+=======
+>>>>>>> buster-security



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/d7f833da6c9f5212bd993b1b3c4ec4e3a222ef4c...136d665875e49ffaf4fa0eb5449a4773e091be31

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/d7f833da6c9f5212bd993b1b3c4ec4e3a222ef4c...136d665875e49ffaf4fa0eb5449a4773e091be31
You're receiving this email because of your account on salsa.debian.org.