diff options
author | intrigeri <intrigeri@boum.org> | 2016-03-16 14:23:08 +0000 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2016-03-16 14:23:08 +0000 |
commit | 46b2f3d2e8c9c8646dfd51280c634ce517d795e6 (patch) | |
tree | ca4e9d9448b51b075c4c98f752c7281c636e23cb /templates/preferences_snippet.erb | |
parent | 3630285006d9fb60c5fbecebc976623c37dd1395 (diff) | |
parent | 8c8bd7bb1e5cc0f5297db9629ece783452233d1f (diff) |
Merge remote-tracking branch 'shared/master' into bugfix/reboot-required-jessie
Diffstat (limited to 'templates/preferences_snippet.erb')
0 files changed, 0 insertions, 0 deletions