elementary OS

Merge lp:~aroman/elementaryos/accept-cookies into lp:~elementary-os/elementaryos/default-settings-trusty

  1. accept-cookies
  2. Merge into default-settings-trusty
Proposed by Avi Romanoff
Status: Merged
Merged at revision: 127
Proposed branch: lp:~aroman/elementaryos/accept-cookies
Merge into: lp:~elementary-os/elementaryos/default-settings-trusty
Diff against target: 11 lines (+1/-0)
1 file modified
midori/config (+1/-0)
To merge this branch: bzr merge lp:~aroman/elementaryos/accept-cookies
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+245390@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/config'
2--- midori/config 2014-11-03 19:50:18 +0000
3+++ midori/config 2014-12-27 01:59:23 +0000
4@@ -6,6 +6,7 @@
5 text-editor=gnome-text-editor %F
6 show-statusbar=false
7 close-buttons-left=true
8+first-party-cookies-only=false
9 toolbar-items=Back,Forward,ReloadStop,BookmarkAdd,Location,CompactMenu,
10 toolbar-style=MIDORI_TOOLBAR_ICONS
11 last-window-width=1000

Subscribers

People subscribed via source and target branches