diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-04-04 21:47:37 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-04 21:47:37 +0200 |
commit | 8fef96cbf507324138c2d59b00ffc82ef4fac11a (patch) | |
tree | 5543993f6692b48b10c7943e6a8bab2f240ca1f7 /app/models/setting.rb | |
parent | 5c5317041f17375666bfaf4788f0adf71804b47d (diff) | |
parent | d3ff06a3205130fa10ffc5d736e8206a9725b5df (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/setting.rb')
0 files changed, 0 insertions, 0 deletions