diff options
author | Tobias Markmann <tm@ayena.de> | 2019-01-15 10:53:33 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2019-01-15 10:55:04 (GMT) |
commit | e618ab44aa09d6b69b08b14d43ee9ff2dd6abb0e (patch) | |
tree | 8e84092fba2f6a01b75b8cf313208aa2c8897216 /Swift/Packaging/Debian/debian | |
parent | 6f6ad903d9e248f59bddedb3ab4cae41a7d8bec0 (diff) | |
parent | 6874d64ed2684d83cb3e340f58f6c8c5089aa857 (diff) | |
download | swift-e618ab44aa09d6b69b08b14d43ee9ff2dd6abb0e.zip swift-e618ab44aa09d6b69b08b14d43ee9ff2dd6abb0e.tar.bz2 |
Merge tag 'swift-4.x' into master
* branch 'swift-4.x':
Update for Debian
Don't crash on missing bookmark result
Add missing include for QAbstractItemModel
Update Debian changelog
Fix convertToWindowsVersion() function to handle more RCs
Fix error response handling when requesting VCards
Test-Information:
./scons test=all succeeded on macOS 10.14.2.
Change-Id: I99d20a8b0e1b0be501fbbe95adebbff15f510184
Diffstat (limited to 'Swift/Packaging/Debian/debian')
-rw-r--r-- | Swift/Packaging/Debian/debian/copyright | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Packaging/Debian/debian/copyright b/Swift/Packaging/Debian/debian/copyright index a0c2c79..9219930 100644 --- a/Swift/Packaging/Debian/debian/copyright +++ b/Swift/Packaging/Debian/debian/copyright @@ -3,7 +3,7 @@ with help from Olly Betts <olly@survex.com>. The upstream sources were obtained from http://swift.im. -Copyright (C) 2010-2016 Isode Limited. +Copyright (C) 2010-2019 Isode Limited. Licensed under the GNU General Public License. See /usr/share/common-licenses/GPL-3 for the full license. |