1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 04:36:34 +01:00

Changes: correct conflict marker and remove reverted removal

This commit is contained in:
Adriaan de Groot 2022-01-18 16:04:03 +01:00
parent b6131a2de9
commit 12aa99ad50

View File

@ -1,6 +1,5 @@
Version 3.2.0 Version 3.2.0
* not released yet * not released yet
<<<<<<< HEAD
* Add support for Screen Capture (Qt 5.13.2+) * Add support for Screen Capture (Qt 5.13.2+)
* Option for internal PDFium-based viewer (Qt 5.13+) * Option for internal PDFium-based viewer (Qt 5.13+)
* CookieManager: Add support for selecting more than one cookie at once * CookieManager: Add support for selecting more than one cookie at once
@ -38,8 +37,6 @@ Version 3.2.0
* VerticalTabs: Corectly recognize tree collapse / expand button * VerticalTabs: Corectly recognize tree collapse / expand button
* VerticalTabs: Also override Ctrl+PgUp/PgDown shortcuts * VerticalTabs: Also override Ctrl+PgUp/PgDown shortcuts
* Remove GnomeKeyringPasswords plugin
Version 3.1.0 Version 3.1.0
* released 19 March 2019 * released 19 March 2019
* add support for writing plugins in QML * add support for writing plugins in QML