Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock		2019-07-30 12:22:33 +02:00
..
chewy	Fix NameError (#11192)	2019-06-27 09:16:55 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
lib	Revert "Remove conversation URI (#11423)" (#11424)	2019-07-28 17:47:37 +02:00
mailers	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
serializers	Revert "Remove conversation URI (#11423)" (#11424)	2019-07-28 17:47:37 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-24 16:23:53 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-28 16:28:05 +02:00