diff options
| author | Azul <azul@riseup.net> | 2016-07-05 08:54:43 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-07-05 08:54:43 +0200 |
| commit | 798c1240b59403b8d8de9559776718266b2ecba5 (patch) | |
| tree | 74b53a8762710a76c4ca5d270b6ef9545dfca221 /app/models/pgp_key.rb | |
| parent | fcc8207f84249612eba719b8aa77cd7c51e5ad5a (diff) | |
| parent | 30da8e6ffa1eefafb9762645efb85e0beed236c6 (diff) | |
Merge remote-tracking branch 'pr/222' into merge-branch
Diffstat (limited to 'app/models/pgp_key.rb')
0 files changed, 0 insertions, 0 deletions