Diffusion KReport 592672f10d3a

Merge remote-tracking branch 'origin/3.2'
592672f10d3a
Actions

Authored by staniek on Jan 11 2019, 4:43 PM.

Description

Merge remote-tracking branch 'origin/3.2'

  1. Conflicts:
  2. src/items/check/check.json
  3. src/items/image/image.json
  4. src/items/text/text.json
  5. src/plugins/maps/kreport_mapsplugin.json

Details

Committed
staniekJan 11 2019, 4:43 PM
Parents
R14:53e03c818284: SVN_SILENT made messages (.desktop file) - always resolve ours
R14:08e56039e695: Merge branch '3.2'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
53e03c818284l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jan 9 2019

Empty Commit

This commit is empty and does not affect any paths.