diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-11 21:30:48 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-11 21:30:48 +0200 |
| commit | 9f7ea77d0c2841fc911afe0485c27750b71e68c3 (patch) | |
| tree | 1585a341c65ce99c7807a0a1807e60900a016bb4 /spec/controllers/settings | |
| parent | 5f74397ef032948ec3c648cec209fd2a279d4dd1 (diff) | |
| parent | 47aacb773bfde280fff3cb00d309a9eb7dc8783b (diff) | |
Merge branch 'master' of github.com:tootsuite/mastodon
Diffstat (limited to 'spec/controllers/settings')
0 files changed, 0 insertions, 0 deletions