diff options
| author | Azul <azul@leap.se> | 2012-12-17 12:33:15 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-17 12:33:15 +0100 |
| commit | 251400a1bf4497fd1f26beb89302187d465a5faa (patch) | |
| tree | 680760fd67d25ab3c4e09ab0a16de1d3996720c6 /Capfile | |
| parent | d64ab283b7bce0d296bb743f030c5361af663456 (diff) | |
| parent | a8f5a1ec486d5ee378f7b820c9f2c046e5c03672 (diff) | |
Merge branch 'feature/certs-from-ca-deamon' into develop
Conflicts:
certs/app/models/leap_ca/cert.rb
Diffstat (limited to 'Capfile')
0 files changed, 0 insertions, 0 deletions