Merge branch 'develop' into pdf_xml

2017-06-26 18:58:12 +02:00 · 2017-06-26 18:58:12 +02:00 · 3f1d91ce37
parent f47381828c d1e83fa973
commit 3f1d91ce37
3 changed files with 4 additions and 4 deletions
--- a/lam-packaging/debian/changelog
+++ b/lam-packaging/debian/changelog
@ -1,8 +1,8 @@
-ldap-account-manager (6.0.RC2-1) unstable; urgency=medium
+ldap-account-manager (6.0-1) unstable; urgency=medium

  * new upstream release

- -- Roland Gruber <post@rolandgruber.de>  Tue, 13 Jun 2017 18:57:21 +0200
+ -- Roland Gruber <post@rolandgruber.de>  Mon, 26 Jun 2017 18:27:21 +0200

 ldap-account-manager (5.7-1) unstable; urgency=medium

--- a/lam/HISTORY
+++ b/lam/HISTORY
@ -1,4 +1,4 @@
-June 2017 6.0
+26.06.2017 6.0
  - Support multiple configurations for same account type
  - PHP 7.1 compatibility
  - Courier users and mail aliases
--- a/lam/VERSION
+++ b/lam/VERSION
@ -1 +1 @@
-6.0.RC2
+6.0
 @ -1 +1 @@
 .0.RC2
 .0