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
..
controllers	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
fabricators	…
features	…
fixtures	…
helpers	…
lib	…
mailers	…
models	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
policies	…
presenters	…
requests	…
routing	…
services	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…