mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-24 18:35:37 +00:00
Merge remote-tracking branch 'origin/Applications/14.12'
Conflicts: VERSION core/version.h
This commit is contained in:
commit
49bc4c34cc