diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
| commit | 3f60b096b51b000905290d69ea05b874b60fa9e0 (patch) | |
| tree | 0b8c7011810b4a97523c2c63816735e519f0682c /public/emoji/1f3db.svg | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | d9cad44ca54374cafa0c97775083bb1bc0a5a3ce (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 'public/emoji/1f3db.svg')
0 files changed, 0 insertions, 0 deletions