diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 18:17:16 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-13 18:17:16 +0000 |
| commit | 82236a37039043d134efb3ddbdd2a3e04e714e2c (patch) | |
| tree | c00cd712a172ac3d5865e94bc505590fa211ecd5 /config/puma.rb | |
| parent | 65d083338debc256360fd6052ec43b98c442320c (diff) | |
| parent | 72314d26aeef0b225401d3f0ad97ea948c66f423 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/puma.rb')
0 files changed, 0 insertions, 0 deletions