diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-04-07 19:02:58 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-04-07 19:02:58 +0200 |
| commit | ad6e4be14deae40dcce63e637c83859e2d753918 (patch) | |
| tree | 985d0d173a609fe436af332215f101a7d352f6b1 /build/debian | |
| parent | 09c434099e1b67fbc5e6b8613ac6cbe9003a76b5 (diff) | |
| parent | 30fc492b44bd2af5436c28e0e1ae399fcc26093d (diff) | |
Merge branch '2.1' of git@github.com:mixxxdj/mixxx.git into 2.2
# Conflicts:
# CHANGELOG
Diffstat (limited to 'build/debian')
| -rw-r--r-- | build/debian/changelog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/debian/changelog b/build/debian/changelog index f742c8420b..2f5b759c01 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -2,7 +2,7 @@ mixxx (2.1.8-0ubuntu1) bionic; urgency=medium * New upstream release - -- Daniel Schürmann <daschuer@mixxx.org> Sat, 23 Feb 2019 10:35:15 +0100 + -- Daniel Schürmann <daschuer@mixxx.org> Sun, 07 Apr 2019 12:14:46 +0200 mixxx (2.1.7-0ubuntu1) bionic; urgency=medium |