diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-09 12:11:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 12:11:14 +0200 |
| commit | 4134a10549a833ad5ab18b3c579304919d594ce1 (patch) | |
| tree | 696f4b453ad029ffda3d0925c484c11b27b95cc6 /app/controllers/about_controller.rb | |
| parent | d0b1369a853dc2e5b7934c148547f71f8d103859 (diff) | |
| parent | b368d3c15ddfca983e89ff2858f7f03eb7147d83 (diff) | |
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/about_controller.rb')
0 files changed, 0 insertions, 0 deletions