diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 20:09:05 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 20:09:05 +0200 |
| commit | 7778de467cd35fa4a514dd97ced0d19675f3b9d9 (patch) | |
| tree | c8048db1bc718663c5ed33c8b225544d5e37f98b /app/controllers/about_controller.rb | |
| parent | fc6d27daf39ca136b0e3e09e7572c5c46086ad72 (diff) | |
| parent | 5bcd98172c2d0ec4827e396a3648eb1e94634c55 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/about_controller.rb')
0 files changed, 0 insertions, 0 deletions