about summary refs log tree commit diff
path: root/app/controllers/admin/settings_controller.rb
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-02-20 16:17:11 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-02-20 16:17:11 +0000
commit544543e40a723d9719f5571bd4c3455a6a69fccd (patch)
tree8d6e8cccbec3cf82b8ffefc93404a807d3eb99e2 /app/controllers/admin/settings_controller.rb
parent1445ba17033cdfdd21d0999f65267754af6344af (diff)
parent712488127380dbdd5bde2783d98f0e9793f4d97b (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/admin/settings_controller.rb')
0 files changed, 0 insertions, 0 deletions