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

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2018-03-09 12:17:22 +00:00
parent 447d7e6127 c1a41181c5
commit e553905ba7
59 changed files with 632 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.production.sample
View File

@@ -11,7 +11,7 @@ DB_PASS=
DB_PORT=5432
# Optional ElasticSearch configuration
# ES_ENABLED=true
# ES_HOST=localhost
# ES_HOST=es
# ES_PORT=9200
# Federation