Arin Alexander ddc793f6e4 Merge branch '1.4' ...

# Conflicts:
#	limereport/items/lrtextitem.cpp
#	limereport/items/lrtextitem.h
#	limereport/lrdatasourcemanager.cpp
#	limereport/lrdatasourcemanager.h

2017-03-01 00:40:36 +03:00

..

limereport_ar.ts

Merge branch '1.4'

2017-03-01 00:40:36 +03:00

limereport_es_ES.qm

Merge branch '1.4'

2017-03-01 00:40:36 +03:00

limereport_es_ES.ts

Merge branch '1.4'

2017-03-01 00:40:36 +03:00

limereport_ru.qm

Merge branch '1.4'

2017-03-01 00:40:36 +03:00

limereport_ru.ts

Merge branch '1.4'

2017-03-01 00:40:36 +03:00