Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
..
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2017-11-20 22:13:37 -08:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2017-12-09 15:35:22 +01:00
2019-04-21 04:52:20 +02:00
2018-01-22 14:20:58 +01:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2017-05-30 23:09:02 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00
2019-07-15 06:12:05 +02:00