Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes		2018-05-27 13:20:15 +02:00
..
chewy
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-27 13:20:15 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-27 13:20:15 +02:00
lib	Merge branch 'master' into glitch-soc/merge-master	2018-05-25 18:59:02 +02:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-27 13:20:15 +02:00
policies	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
presenters	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-04 18:17:32 +00:00
serializers	Add missing comma in InitalStateSerializer (fixes #516)	2018-05-25 14:06:48 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-21 16:40:02 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-27 13:20:15 +02:00
views	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-21 18:17:23 +00:00
workers	checking http status code with range (#7544)	2018-05-19 14:47:44 +02:00