• Lukas Fülling's avatar
    Merge branch 'master' of git.k40s.net:commnet/mastodon · da101c92
    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/lib/activitypub/activity.rb
    	app/lib/activitypub/activity/announce.rb
    	app/lib/activitypub/activity/create.rb
    	config/locales/en.yml
    	config/locales/simple_form.de.yml
    	config/settings.yml
    	package.json
    	spec/lib/activitypub/activity/announce_spec.rb
    	yarn.lock
    da101c92
Name
Last commit
Last update
..
environments Loading commit data...
initializers Loading commit data...
locales Loading commit data...
webpack Loading commit data...
application.rb Loading commit data...
boot.rb Loading commit data...
brakeman.ignore Loading commit data...
database.yml Loading commit data...
deploy.rb Loading commit data...
environment.rb Loading commit data...
i18n-tasks.yml Loading commit data...
navigation.rb Loading commit data...
puma.rb Loading commit data...
routes.rb Loading commit data...
secrets.yml Loading commit data...
settings.yml Loading commit data...
sidekiq.yml Loading commit data...
themes.yml Loading commit data...
webpacker.yml Loading commit data...