Diffusion Kexi d7678f6a826a

Merge remote-tracking branch 'origin/3.2'

Authored by staniek on Sep 29 2019, 2:50 PM.

Description

Merge remote-tracking branch 'origin/3.2'

  1. Conflicts:
  2. src/migration/mdb/src/keximdb/keximigrate_mdb.json
  3. src/migration/mysql/keximigrate_mysql.json
  4. src/migration/postgresql/keximigrate_postgresql.json
  5. src/migration/tsv/keximigrate_tsv.json
  6. src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json
  7. src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json

Details

Merged Changes

CommitAuthorDetailsCommitted
ec7992cd0844staniek
GIT_SILENT Update .krazy file 
Sep 29 2019
9802bd71a804staniek
GIT_SILENT fix spelling 
Sep 29 2019
a2bbea3e35ael10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Sep 22 2019
ea96f0cf3bc4l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Sep 16 2019