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
..
activity	Merge branch 'master' of https://github.com/noiob/awoospace	2019-12-21 22:29:34 -05:00
activity.rb	Add basic support for group actors (#12071)	2019-12-04 20:36:33 +01:00
adapter.rb	Update ESLint and RuboCop in Code Climate (#12534)	2019-12-02 18:25:43 +01:00
case_transform.rb	Add serializing/unserializing of "locked" actor attribute (#4585)	2017-08-12 17:41:03 +02:00
linked_data_signature.rb	Add CLI task for rotating keys (#8466)	2018-08-26 20:21:03 +02:00
serializer.rb	Fix ActivityPub context not being dynamically computed (#11746)	2019-09-03 22:52:32 +02:00
tag_manager.rb	Add basic support for group actors (#12071)	2019-12-04 20:36:33 +01:00