diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 04:10:16 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-11 04:10:16 +0000 |
commit | efc9ffcb80b995ef8c8d95ab1d8cb0af8efc094d (patch) | |
tree | 6ce57e5980ba0279355f97893d21852caace0232 /config/puma.rb | |
parent | b6159bcb0a20f3aabfb4d17ad60842b7aa81925c (diff) | |
parent | 718802a05dfb3211d758513daf6070ffa22751dd (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/puma.rb')
0 files changed, 0 insertions, 0 deletions