diff options
| author | varac <varacanero@zeromail.org> | 2012-09-23 16:09:43 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-09-23 16:09:43 +0200 |
| commit | 29b968b8462487f9a8dce83a95554316b53570a1 (patch) | |
| tree | aa77b144ec2c403297495fb01f8b362874dbd58f /config/defaults.yaml | |
| parent | 276de1e249b25e5e00c49229132215681aee6467 (diff) | |
| parent | 8fb0fcd72bdb357942d5e9adc2092e78ce6e1ee0 (diff) | |
Merge branch 'master' into openvpn
Conflicts:
.gitmodules
Diffstat (limited to 'config/defaults.yaml')
0 files changed, 0 insertions, 0 deletions