diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-18 06:17:14 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-18 06:17:14 +0000 |
| commit | eed50514bea3c5a1aa96b0193b26331014bf9e9b (patch) | |
| tree | 6a3c1a4e6b2b4e990c962c30c93121e616aeda9c /app/controllers/settings/preferences_controller.rb | |
| parent | 5a9982b425d3db65d813eb0314a27cea16f0f52d (diff) | |
| parent | 6be72a3ec6d87af4de245b96fea45191ac01114e (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
0 files changed, 0 insertions, 0 deletions