about summary refs log tree commit diff
path: root/app/javascript/images
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-07-15 15:32:40 +0200
committerThibaut Girka <thib@sitedethib.com>2020-07-15 15:32:40 +0200
commit3f60b096b51b000905290d69ea05b874b60fa9e0 (patch)
tree0b8c7011810b4a97523c2c63816735e519f0682c /app/javascript/images
parent7a23347db5be3f262dbcafbecf768588dc648bda (diff)
parentd9cad44ca54374cafa0c97775083bb1bc0a5a3ce (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
Diffstat (limited to 'app/javascript/images')
0 files changed, 0 insertions, 0 deletions