Merge branch 'hig-folder' into 'master'

Authored by mreeves on Jan 19 2020, 8:24 PM.

Description

Merge branch 'hig-folder' into 'master'

Change ‘directory’ to ‘folder’ in user-visible strings

See merge request kde/kdiff3!1

Merged Changes

CommitAuthorDetailsCommitted
181eda3c1ed7adrianchavesfernandez/mreeves
Change ‘directory’ to ‘folder’ in user-visible strings 
Jan 19 2020