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
..
migrate	Merge branch 'master' of https://github.com/noiob/awoospace	2019-12-21 22:29:34 -05:00
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
schema.rb	Add bookmarks (#7107)	2019-11-13 23:02:10 +01:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00