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 /.env.production.sample | |
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 '.env.production.sample')
-rw-r--r-- | .env.production.sample | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.env.production.sample b/.env.production.sample index 6d9929f70..d51144d96 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -2,7 +2,7 @@ # with the `rake mastodon:setup` interactive setup wizard, but to customize # your setup even further, you'll need to edit it manually. This sample does # not demonstrate all available configuration options. Please look at -# https://docs.joinmastodon/admin/config/ for the full documentation. +# https://docs.joinmastodon.org/admin/config/ for the full documentation. # Federation # ---------- |