diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-27 22:33:26 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-11-27 22:33:26 -0600 |
commit | 7463d80ff442833a4ad299460f37c27be9b8cda1 (patch) | |
tree | eb84f712515a4b5c59a36cbc0340781c6765a545 /spec/controllers/settings/preferences_controller_spec.rb | |
parent | 8bad6bdd00254484e04570b7a631403c24e73939 (diff) | |
parent | 706e534455e2137c324c0ebb30435e7630ab7c1f (diff) |
Merge remote-tracking branch 'tootsuite/master'
Diffstat (limited to 'spec/controllers/settings/preferences_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions