diff options
author | ThibG <thib@sitedethib.com> | 2019-07-24 16:53:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-24 16:53:25 +0200 |
commit | 88e79c179a1a48feff3b16226c46f5885442651e (patch) | |
tree | 020d6a6ef6b4a236f14d6287e4ff97c0750db3c9 /config/environment.rb | |
parent | e3a551cbd1f894fa779dc55168e56bb5f07b3d72 (diff) | |
parent | 2d35e4460a6c55930568d4b19563f9894d89e79b (diff) |
Merge pull request #1176 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/environment.rb')
0 files changed, 0 insertions, 0 deletions