Thibaut Girka 98dccee657 Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.		2018-08-21 18:24:48 +02:00
..
chewy	…
controllers	Merge branch 'master' into glitch-soc/master	2018-08-21 18:24:48 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-19 09:27:18 +02:00
javascript	Merge branch 'master' into glitch-soc/master	2018-08-21 18:24:48 +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/master	2018-08-21 18:24:48 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-19 09:27:18 +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/master	2018-08-21 18:24:48 +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-19 09:27:18 +02:00
workers	Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote (#8339)	2018-08-21 17:53:01 +02:00