Mastodon

Files

Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb

2019-06-07 17:00:36 +02:00

…

2019-05-28 17:45:06 +02:00

2019-06-07 17:00:36 +02:00

2019-06-04 20:40:19 +02:00

application.rb

…

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

…

navigation.rb

2019-04-10 09:16:08 +02:00

puma.rb

…

routes.rb

2019-04-10 09:16:08 +02:00

secrets.yml

…

settings.yml

2019-06-03 14:54:30 +02:00

sidekiq.yml

…

webpacker.yml

…