tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
This commit is contained in:
Thibaut Girka
2020-07-15 15:32:40 +02:00
parent 7a23347db5 d9cad44ca5
commit 3f60b096b5
156 changed files with 2855 additions and 1070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.production.sample
View File

@ -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
# ----------