about summary refs log tree commit diff
path: root/app/helpers/settings_helper.rb
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-03-17 17:17:21 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-03-17 17:17:21 +0000
commit9341b982b611ed3655489a01ba32720b84dfefdc (patch)
tree7abfc11e2beca92d2716fd6236a8ef9028fbaf31 /app/helpers/settings_helper.rb
parentfe17446af0b13036c08335cebb7b0938c038667d (diff)
parent566ace2d6479c05e51dd8ce24283b8606be631de (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/helpers/settings_helper.rb')
0 files changed, 0 insertions, 0 deletions