Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

8b883997

Commit 8b883997 authored 7 years ago by Eugen Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge branch 'master' into master

parents 29efeecb 78cf0fe1

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 0 additions, 2 deletions

Gemfile
Gemfile.lock 0 additions, 11 deletions

Gemfile.lock
app/assets/javascripts/components/locales/fi.jsx 6 additions, 6 deletions

app/assets/javascripts/components/locales/fi.jsx
app/models/status.rb 2 additions, 2 deletions

app/models/status.rb
app/workers/application_worker.rb 5 additions, 0 deletions

app/workers/application_worker.rb
app/workers/distribution_worker.rb 2 additions, 2 deletions

app/workers/distribution_worker.rb
config/locales/simple_form.fi.yml 2 additions, 2 deletions

config/locales/simple_form.fi.yml
docs/Running-Mastodon/Production-guide.md 12 additions, 0 deletions

docs/Running-Mastodon/Production-guide.md
docs/Using-Mastodon/List-of-Mastodon-instances.md 3 additions, 1 deletion

docs/Using-Mastodon/List-of-Mastodon-instances.md
docs/Using-Mastodon/User-guide.md 3 additions, 3 deletions

docs/Using-Mastodon/User-guide.md
docs/Using-the-API/API.md 1 addition, 1 deletion

docs/Using-the-API/API.md

with 36 additions and 30 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment