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.

imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		7 years ago
..
core	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
flavours	Revert 4a48d03b31 (fixes #348)	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 branch 'master' of https://github.com/tootsuite/mastodon	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 branch 'master' of https://github.com/tootsuite/mastodon	7 years ago