diff options
author | ThibG <thib@sitedethib.com> | 2019-03-18 19:54:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-18 19:54:23 +0100 |
commit | b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (patch) | |
tree | 2d5705651ce83b73900ff3e2ce61d8fef1c1b25d /config/puma.rb | |
parent | 6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (diff) | |
parent | 841b920af5de8e3188111ca4dbea0c5105bde88c (diff) |
Merge pull request #963 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/puma.rb')
0 files changed, 0 insertions, 0 deletions