• Lukas Fülling's avatar
    Merge branch 'master' of github.com:tootsuite/mastodon · b4a8d758
    Lukas Fülling authored
     Conflicts:
    	README.md
    	app/javascript/mastodon/components/status_action_bar.js
    	app/javascript/mastodon/features/getting_started/index.js
    	app/javascript/mastodon/features/status/components/action_bar.js
    	app/javascript/mastodon/features/status/components/detailed_status.js
    	app/javascript/mastodon/features/ui/index.js
    	app/javascript/mastodon/locales/ar.json
    	app/javascript/mastodon/locales/ca.json
    	app/javascript/mastodon/locales/de.json
    	app/javascript/mastodon/locales/fi.json
    	app/javascript/mastodon/locales/ja.json
    	app/javascript/mastodon/locales/pl.json
    	app/models/account.rb
    	app/views/layouts/error.html.haml
    	app/views/stream_entries/_simple_status.html.haml
    	app/views/tags/show.html.haml
    	config/locales/ast.yml
    	config/locales/ca.yml
    	config/locales/co.yml
    	config/locales/de.yml
    	config/locales/devise.ja.yml
    	config/locales/devise.ru.yml
    	config/locales/devise.sk.yml
    	config/locales/el.yml
    	config/locales/en.yml
    	config/locales/eo.yml
    	config/locales/gl.yml
    	config/locales/he.yml
    	config/locales/hu.yml
    	config/locales/id.yml
    	config/locales/io.yml
    	config/locales/nl.yml
    	config/locales/oc.yml
    	config/locales/pt-BR.yml
    	config/locales/simple_form.de.yml
    	config/locales/te.yml
    	config/locales/th.yml
    	config/locales/tr.yml
    	config/locales/zh-CN.yml
    	config/locales/zh-HK.yml
    	package.json
    	yarn.lock
    b4a8d758
Name
Last commit
Last update
..
avatars/original Loading commit data...
emoji Loading commit data...
headers/original Loading commit data...
sounds Loading commit data...
500.html Loading commit data...
android-icon-144x144.png Loading commit data...
android-icon-192x192.png Loading commit data...
android-icon-36x36.png Loading commit data...
android-icon-48x48.png Loading commit data...
android-icon-72x72.png Loading commit data...
android-icon-96x96x.png Loading commit data...
apple-touch-icon-114x114.png Loading commit data...
apple-touch-icon-120x120.png Loading commit data...
apple-touch-icon-144x144.png Loading commit data...
apple-touch-icon-152x152.png Loading commit data...
apple-touch-icon-57x57.png Loading commit data...
apple-touch-icon-60x60.png Loading commit data...
apple-touch-icon-72x72.png Loading commit data...
apple-touch-icon-76x76.png Loading commit data...
badge.png Loading commit data...
browserconfig.xml Loading commit data...
embed.js Loading commit data...
favicon-128.png Loading commit data...
favicon-16x16.png Loading commit data...
favicon-196x196.png Loading commit data...
favicon-32x32.png Loading commit data...
favicon-96x96.png Loading commit data...
favicon.ico Loading commit data...
manifest.json Loading commit data...
mask-icon.svg Loading commit data...
mstile-144x144.png Loading commit data...
mstile-150x150.png Loading commit data...
mstile-310x150.png Loading commit data...
mstile-310x310.png Loading commit data...
mstile-70x70.png Loading commit data...
oops.gif Loading commit data...
oops.png Loading commit data...
robots.txt Loading commit data...
sw.js Loading commit data...
web-push-icon_expand.png Loading commit data...
web-push-icon_favourite.png Loading commit data...
web-push-icon_reblog.png Loading commit data...
zalgo.js Loading commit data...