diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-05 02:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-05 02:17:12 +0000 |
| commit | 3405ea6dd9fde38ba1044933fec2ec7fa909ea8c (patch) | |
| tree | 8f505bd350cdf42df8ef0708641c481194cce49f /app/lib/user_settings_decorator.rb | |
| parent | e815d6803d3e7c607e8bb04a5a14048ab08e6508 (diff) | |
| parent | 95c8232109f5e59273de48858ede7fbe7ce63d58 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/lib/user_settings_decorator.rb')
0 files changed, 0 insertions, 0 deletions