diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-31 00:37:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-31 00:37:16 +0100 |
| commit | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (patch) | |
| tree | 324003d03c66caead9842a6052bc28caf7f654c2 /app/controllers/admin/instances_controller.rb | |
| parent | b6fa500806f68d5394174e1f341dc61e3578760e (diff) | |
| parent | b72950fbd3536260df0b9c22179a6024d4d0c189 (diff) | |
Merge pull request #976 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/instances_controller.rb')
0 files changed, 0 insertions, 0 deletions