diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 04:17:11 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-08 04:17:11 +0000 |
| commit | 722b3f567f18ae31b05f320441c73279b4f5ad11 (patch) | |
| tree | 8e009982fa512566ce7172c8b4fe610be38d5c39 /app/controllers/settings/base_controller.rb | |
| parent | f7c4d4464ba3b3729d707c54c4d2aa7515a9fe57 (diff) | |
| parent | e4a241abefaa68492938c3fbb7e5e5401d12138e (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/settings/base_controller.rb')
0 files changed, 0 insertions, 0 deletions