You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/javascript/core
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
8 years ago
..
admin.js Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
common.js
embed.js
mailer.js
public.js Scroll to linked status in public status view 8 years ago
settings.js Restore glitch-soc's 500 characters limit for bios (fixes #625) 8 years ago
theme.yml