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	…
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	…
models	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
policies	…
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	…
views	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
workers	…