about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-10-26 15:47:21 +0100
committerThibaut Girka <thib@sitedethib.com>2020-10-26 15:48:16 +0100
commit9c34090db84fc28bf6c40da700095f025f1887ea (patch)
tree960afb18131d57f7120c0d584915f0c2c29902bb /config
parent36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (diff)
parent3678b10823a691256ad63c1c4df8dc659dfc3bc0 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions