about summary refs log tree commit diff
path: root/config/environments
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-07-05 19:35:56 +0200
committerThibaut Girka <thib@sitedethib.com>2020-07-05 19:35:56 +0200
commit2d8be0a6e1fbe9da892937b05b373ab907d89b77 (patch)
tree73eb669adcc8b13c63dded5a887cb5ecc817894d /config/environments
parent9b3677d5097fb50f90a6abdce9d722e81d2db469 (diff)
parent99f3a5554074d9a12619797c474b3de4c6085f02 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream changed it completely.
  Changed ours to merge upstream's new structure, but
  keeping most of the information.
Diffstat (limited to 'config/environments')
0 files changed, 0 insertions, 0 deletions