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
..
_administration.html.haml
_contact.html.haml
_features.html.haml
_forms.html.haml
_links.html.haml
_registration.html.haml
more.html.haml
show.html.haml
terms.html.haml