Merge remote-tracking branch 'origin' into anmolgautam
Description
Description
Details
Details
- Committed
anmolgautam May 31 2018, 9:41 AM - Parents
- R875:7b52c25caa9a: resolved pull conflict
R875:fa7aa25a5d52: SVN_SILENT made messages (.desktop file) - always resolve ours - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| fa7aa25a5d52 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | May 29 2018 | |||
| 0f1c46d0e760 | drosca | Merge branch 'Falkon/3.0' | May 26 2018 | |||
| 7c07af64feba | drosca | AdBlockManager: Temporarily remove url interceptor when updating matcher | May 26 2018 | |||
| 42f70c5252d4 | drosca | Add missing config.h include for HAVE_QTWEBENGINE_5_10 define | May 26 2018 | |||
| ae16c6429025 | D13109 | anmolgautam | Added sorting in cookie filter list | May 25 2018 | ||
| 326be38a45d4 | D13097 | tuomisto/drosca | Allow whitelisted cookies to be kept | May 25 2018 | ||
| 37a79e3ad4b4 | D12980 | tcberner | Use IMPORTED_TARGET for GnomeKeyring. | May 19 2018 | ||
| 1d03b5d44bb8 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | May 19 2018 | |||
| 277003fa1d83 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | May 16 2018 |