diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-08 23:17:14 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-08 23:17:14 +0000 |
| commit | 5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (patch) | |
| tree | a3bb67479db79ca9777cf2d6c1b767ad0f0f53d2 /app/lib/user_settings_decorator.rb | |
| parent | 3405ea6dd9fde38ba1044933fec2ec7fa909ea8c (diff) | |
| parent | 1167c6dbf8d5b8411d9924350b2b9735da6d9d26 (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