Permalink
Browse files

Merge branch 'maintenance' into develop

  • Loading branch information...
wagner-certat committed Sep 10, 2018
2 parents 6946524 + c294cc1 commit 4171b2833b74c9146c3f64fb3bb18baa5d361f27
Showing with 3 additions and 1 deletion.
  1. +2 −0 CHANGELOG.md
  2. +1 −1 debian/control
View
@@ -61,6 +61,7 @@ CHANGELOG
#### Collectors
#### Parsers
- `intelmq.bots.parsers.misp`: Fix Object attribute (#1318).
#### Experts
@@ -70,6 +71,7 @@ CHANGELOG
### Documentation
### Packaging
- Change the maintainer from Sasche Wilde to Sebastian Wagner (#1320).
### Tests
View
@@ -1,5 +1,5 @@
Source: intelmq
Maintainer: Sascha Wilde <wilde@intevation.de>
Maintainer: Sebastian Wagner <wagner@cert.at>
Section: python
Priority: optional
Build-Depends: debhelper (>= 4.1.16), python3-all, python3-setuptools, quilt, dh-python, python-setuptools, dh-systemd, safe-rm, python3-requests, python3-redis, python3-dnspython, python3-psutil, python3-dateutil, python3-termstyle, python3-tz, lsb-release

0 comments on commit 4171b28

Please sign in to comment.