Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +02:00
..
chewy	Full-text search for authorized statuses (#6423)	2018-02-09 23:04:47 +01:00
controllers	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
helpers	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
javascript	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
lib	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
mailers	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
models	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +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	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
services	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
validators	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
views	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
workers	Fixes/do not override timestamps (#7336)	2018-05-03 23:02:46 +02:00