diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-13 22:25:07 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-13 22:25:07 +0200 |
| commit | 41c697fd8190ffef517404b4a4fdef805517166d (patch) | |
| tree | 399f10695effb584683376d3d48d178da6d09824 /app/models/account.rb | |
| parent | c5afe573da39aff73a309d95d3a8ce492a73d3a6 (diff) | |
| parent | 9aae9ae40cf40d4c66b2eae00fd3f290f3479124 (diff) | |
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
Diffstat (limited to 'app/models/account.rb')
0 files changed, 0 insertions, 0 deletions