diff options
| author | elijah <elijah@riseup.net> | 2016-03-28 16:02:32 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-03-28 16:02:32 -0700 |
| commit | ef5f9636863a8bddb704714027c6540dc5a0b781 (patch) | |
| tree | 6e7fa2ce54895643f4c247db2fed9350eca1539b /app/models/pgp_key.rb | |
| parent | d7899039a4431cfac22d710bbc37b06160e8fc8c (diff) | |
| parent | 6f2b628d884336e3c63dd77255ce0d95f6c2435e (diff) | |
Merge branch 'azul-upgrade/rails' into develop
Diffstat (limited to 'app/models/pgp_key.rb')
0 files changed, 0 insertions, 0 deletions