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
..
_features.html.haml	Grid layout for tag pages (#6545)	2018-02-26 17:43:45 +01:00
_og.html.haml	Redesign public hashtag pages (#5237)	2017-10-07 20:00:35 +02:00
show.html.haml	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00