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
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
common.js	Whitelist fixes	2018-08-22 18:20:31 -07:00
embed.js	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
mailer.js	Fixed improper mailer import	2018-01-15 21:23:26 -08:00
public.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
settings.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
theme.yml	Include necessary JS in auth pages	2019-06-13 22:38:22 +02:00