• 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
..
assets Loading commit data...
devise Loading commit data...
generators Loading commit data...
json_ld Loading commit data...
mastodon Loading commit data...
paperclip Loading commit data...
tasks Loading commit data...
templates Loading commit data...
cli.rb Loading commit data...