diff options
| author | kali <kali@leap.se> | 2012-08-08 09:00:02 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-08-08 09:00:02 +0900 |
| commit | 01561795251a4eb2255548da22036660cfbf1dda (patch) | |
| tree | 285d105ec659a2c18f0d544ca9d624283239ed44 /.gitignore | |
| parent | 359adbca9dbde07f4054c775650adcd20823f29c (diff) | |
| parent | c217bd1f1456cf10ceabf698ea6f4dd8f636f454 (diff) | |
Merge branch 'ovpn-invocation' into tests-cleanup
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -12,4 +12,4 @@ include/ lib/ local/ share/ -src/leap_client.egg-info/ +src/leap.egg-info/ |