Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.		2018-08-18 18:04:49 +02:00
..
chewy
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
policies	Disallow remote users from viewing local-only toots	2018-07-31 15:41:04 +02:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-26 21:22:43 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
workers	Fix ActivityPub::UpdateDistributionWorker regression (#8039)	2018-07-16 18:43:22 +02:00