diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-13 12:00:39 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-13 12:00:39 -0500 |
| commit | 0e4cd139d4824c7c80598aea553bd493b8f621b8 (patch) | |
| tree | 36d104da9d298d57d7a2c89ddc48868a3354143c /801376b8eb09877fbe2553ed74770c417bbdebf9 | |
| parent | c58c6772a0b3aea6f8e807af9bad3070c0a7ac18 (diff) | |
| parent | 2ec8081667c1f12591e3de5c03942c6f19e7e1bf (diff) | |
Merge branch 'add_signwith' into leap
Conflicts:
templates/distributions.erb
Diffstat (limited to '801376b8eb09877fbe2553ed74770c417bbdebf9')
0 files changed, 0 insertions, 0 deletions