• 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
..
controllers Loading commit data...
fabricators Loading commit data...
features Loading commit data...
fixtures Loading commit data...
helpers Loading commit data...
lib Loading commit data...
mailers Loading commit data...
models Loading commit data...
policies Loading commit data...
presenters Loading commit data...
requests Loading commit data...
routing Loading commit data...
services Loading commit data...
support Loading commit data...
validators Loading commit data...
views Loading commit data...
workers Loading commit data...
rails_helper.rb Loading commit data...
spec_helper.rb Loading commit data...