Merge branch 'Plasma/5.17'

Authored by sitter on Nov 8 2019, 12:15 PM.

Description

Merge branch 'Plasma/5.17'

  1. Conflicts:
  2. CMakeLists.txt

Details

Merged Changes

CommitAuthorDetailsCommitted
4e29b8a75635sitter
force-encode passwords on login 
Nov 8 2019
ea5041326097jriddell
Update version number for 5.17.2 GIT_SILENT 
Oct 29 2019