Merge lp:~madsa/elementaryos/fix-1611934 into lp:~elementary-os/elementaryos/default-settings-loki

Proposed by Matt Spaulding on 2016-09-25
Status: Merged
Merged at revision: 210
Proposed branch: lp:~madsa/elementaryos/fix-1611934
Merge into: lp:~elementary-os/elementaryos/default-settings-loki
Diff against target: 15 lines (+2/-0)
2 files modified
debian/install (+1/-0)
sudoers.d/pwfeedback (+1/-0)
To merge this branch: bzr merge lp:~madsa/elementaryos/fix-1611934
Reviewer Review Type Date Requested Status
elementary OS team 2016-09-25 Pending
Review via email: mp+306720@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 'debian/install'
2--- debian/install 2016-07-28 22:55:34 +0000
3+++ debian/install 2016-09-25 22:36:01 +0000
4@@ -5,3 +5,4 @@
5 profile.d/*.sh /etc/profile.d/
6 native-origins.d/* /etc/apport/native-origins.d/
7 wingpanel.d/* /etc/wingpanel.d/
8+sudoers.d/* /etc/sudoers.d/
9
10=== added directory 'sudoers.d'
11=== added file 'sudoers.d/pwfeedback'
12--- sudoers.d/pwfeedback 1970-01-01 00:00:00 +0000
13+++ sudoers.d/pwfeedback 2016-09-25 22:36:01 +0000
14@@ -0,0 +1,1 @@
15+Defaults pwfeedback

Subscribers

People subscribed via source and target branches