Merge remote-tracking branch 'origin/3.2'

Authored by staniek on Dec 13 2018, 2:07 PM.

Description

Merge remote-tracking branch 'origin/3.2'

  1. Conflicts:
  2. CMakeLists.txt
  3. src/items/check/check.json
  4. src/items/field/field.json
  5. src/items/image/image.json
  6. src/items/label/label.json
  7. src/items/text/text.json
  8. src/plugins/barcode/kreport_barcodeplugin.json
  9. src/plugins/chart/kreport_chartplugin.json
  10. src/plugins/maps/kreport_mapsplugin.json
  11. src/plugins/web/kreport_webplugin.json

Merged Changes

CommitAuthorDetailsCommitted
ecad1f9bd178staniek
Version 3.2.0 
Dec 13 2018
a6a7d9582e9fl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Dec 3 2018
b68a2c85ef72l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Nov 3 2018
f4720728dfd5l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Oct 24 2018