Merge branch 'master' into develop

Browse Source

# Conflicts:
#	limereport/objectinspector/propertyItems/lrdatasourcepropitem.cpp

...

This commit is contained in:

Arin Alexander

2019-05-12 23:15:07 +03:00

parent 22c020569d b768285cd9

commit 3f0558f2e9

5 changed files with 3370 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3293

translations/limereport_pl.ts Normal file

File diff suppressed because it is too large Load Diff