You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
core	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
flavours	Fix border-radius of owner avatar in /about/more	7 years ago
fonts	Theme: Windows 95	7 years ago
images	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
locales	Javascript intl8n flavour support	7 years ago
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
packs	Fix hide and show media button on admin page (#6347)	7 years ago
skins/vanilla/win95	Ruby intl8n for themes	7 years ago
styles	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago