David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06: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 remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00