Merge remote-tracking branch 'remotes/origin/develop' into webauthn

# Conflicts:
#	lam/HISTORY

lam-packaging/debian/changelog

@@ -1,8 +1,8 @@
-ldap-account-manager (7.0.RC1-1) unstable; urgency=medium
+ldap-account-manager (7.0-1) unstable; urgency=medium
 
   * new upstream release
 
- -- Roland Gruber <post@rolandgruber.de>  Sun, 08 Dec 2019 09:14:46 +0100
+ -- Roland Gruber <post@rolandgruber.de>  Sat, 21 Dec 2019 19:53:45 +0100
 
 ldap-account-manager (6.9-1) unstable; urgency=medium
 

lam-packaging/docker/Dockerfile

@@ -29,7 +29,7 @@
 FROM debian:buster-slim
 LABEL maintainer="Roland Gruber <post@rolandgruber.de>"
 
-ARG LAM_RELEASE=7.0.RC1
+ARG LAM_RELEASE=7.0
 
 ENV \
     DEBIAN_FRONTEND=noninteractive \

lam-packaging/docker/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     build:
       context: .
       args:
-       - LAM_RELEASE=7.0.RC1
+       - LAM_RELEASE=7.0
     image: ldapaccountmanager/lam:latest
     restart: unless-stopped
     ports:

lam/HISTORY

@@ -1,8 +1,12 @@
-December 2019 7.0
+March 2020 7.1
   - PHP 7 required
+
+
+21.12.2019 7.0
   - Lamdaemon can be configured with directory prefix for homedirs
   - Account list filters match on substrings instead of whole value
   - YubiKey: support to configure multiple verification servers
+  - Windows hosts: added last password change and last login
   - Deactivated non-maintained translations: Catalan, Czech, Hungarian, Polish and Turkish
     Contact us if you would like to take over. Translators get LAM Pro for free (commercial use included).
   - Docker updates

lam/VERSION

@@ -1 +1 @@
-7.0.RC1
+7.0