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-01-11 07:28:09 +00:00
2019-07-19 18:26:49 +02:00
2017-07-18 16:38:22 +02:00
2018-10-04 12:36:53 +02:00
2018-10-07 23:44:58 +02:00
2018-11-26 15:53:27 +01:00
2018-10-04 12:36:53 +02:00
2019-07-19 01:44:42 +02:00
2018-11-19 00:43:52 +01:00
2018-12-07 16:37:56 +01:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2019-06-28 15:54:10 +02:00
2018-12-21 18:52:57 +01:00
2018-12-11 05:30:57 +01:00
2018-10-04 12:36:53 +02:00
2019-06-22 00:13:10 +02:00
2017-11-14 20:37:17 +01:00
2019-04-08 07:28:27 +02:00
2019-02-04 04:25:59 +01:00
2018-05-04 14:16:30 -05:00
2018-10-04 17:36:11 +02:00
2017-11-18 00:16:48 +01:00
2018-12-06 17:38:49 +09:00
2017-09-02 20:45:42 +02:00
2017-11-27 16:07:59 +01:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2018-12-06 17:39:15 +09:00
2019-03-03 22:18:23 +01:00
2019-03-03 22:18:23 +01:00
2018-10-04 12:36:53 +02:00
2018-07-13 02:16:06 +02:00
2018-10-04 12:36:53 +02:00
2018-05-03 10:42:36 +02:00
2019-01-05 12:43:28 +01:00
2017-11-13 09:54:48 +09:00
2018-02-17 22:35:05 +01:00
2017-11-14 20:44:11 +01:00
2018-04-25 14:12:28 +02:00
2019-07-05 02:14:56 +02:00
2018-11-19 00:43:52 +01:00
2018-09-14 00:53:09 +02:00
2019-07-18 03:02:56 +02:00
2019-04-09 23:06:30 +09:00
2018-12-24 19:12:38 +01:00