diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-09 14:12:40 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-09 14:12:40 +0100 |
| commit | def1f8c5b3ec4bc5bd8c8335b4919e011d2757b9 (patch) | |
| tree | 36ce2a57e7b686f19132ebb12fcd177b3df4c7c0 /spec/controllers/settings/profiles_controller_spec.rb | |
| parent | d6a456dc714337a696e206c31d182630a94f89cd (diff) | |
| parent | 131bae89fd3ea601b032c9650edb3693801c9467 (diff) | |
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
Diffstat (limited to 'spec/controllers/settings/profiles_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions