mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-22 01:40:02 +00:00
Merge branch 'KDE/4.14'
Conflicts: dolphin/src/dolphinmainwindow.cpp
This commit is contained in:
commit
773028f270
Conflicts: dolphin/src/dolphinmainwindow.cpp