an 7126d53baf Merge branch 'master' of https://github.com/noiob/awoospace ... # Conflicts: # app/controllers/settings/preferences_controller.rb # app/helpers/settings_helper.rb # app/javascript/flavours/glitch/features/compose/components/compose_form.js # app/javascript/flavours/glitch/features/compose/components/publisher.js # app/javascript/flavours/glitch/styles/about.scss # app/javascript/flavours/glitch/styles/variables.scss # app/javascript/mastodon/features/ui/components/modal_root.js # app/javascript/styles/mastodon/variables.scss # app/lib/ostatus/activity/creation.rb # app/models/status.rb # app/services/pubsubhubbub/subscribe_service.rb # app/services/resolve_account_service.rb # app/services/send_interaction_service.rb # app/services/update_remote_profile_service.rb # app/validators/status_length_validator.rb # app/views/about/more.html.haml # app/views/about/show.html.haml # app/workers/pubsubhubbub/delivery_worker.rb # config/application.rb # config/locales/simple_form.en.yml		2019-12-21 22:29:34 -05:00
..
fetch_featured_collection_service.rb	Refactor domain block checks (#11268)	2019-07-09 03:27:35 +02:00
fetch_remote_account_service.rb	Refactor domain block checks (#11268)	2019-07-09 03:27:35 +02:00
fetch_remote_key_service.rb	Improve federated ID validation (#8372)	2018-08-22 20:55:14 +02:00
fetch_remote_poll_service.rb	Refactor domain block checks (#11268)	2019-07-09 03:27:35 +02:00
fetch_remote_status_service.rb	Refactor fetching of remote resources (#11251)	2019-07-10 18:59:28 +02:00
fetch_replies_service.rb	Fix poll update handler calling method was that was not available (#10246)	2019-03-12 22:58:59 +01:00
process_account_service.rb	Merge branch 'master' of https://github.com/noiob/awoospace	2019-12-21 22:29:34 -05:00
process_collection_service.rb	Refactor domain block checks (#11268)	2019-07-09 03:27:35 +02:00
process_poll_service.rb	Fix empty poll options not being filtered on remote poll update (#12484)	2019-11-26 22:46:31 +01:00