]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'release/21.08'
authorNate Graham <nate@kde.org>
Mon, 2 Aug 2021 16:32:31 +0000 (10:32 -0600)
committerNate Graham <nate@kde.org>
Mon, 2 Aug 2021 16:32:31 +0000 (10:32 -0600)
1  2 
src/dolphinmainwindow.cpp
src/main.cpp

Simple merge
diff --cc src/main.cpp
Simple merge