David Yip 6dd676e006 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: config/locales/pl.yml The conflict in config/locales/pl.yml concerns the themes key, which is not used in glitchsoc. Resolution: remove the themes key-related changes, i.e. accept-ours.		2018-05-21 16:30:24 -05:00
..
chewy
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-21 16:40:02 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
javascript	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-21 16:30:24 -05:00
lib	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
policies
presenters
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-21 16:40:02 +02:00
validators
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