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
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
..
core Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
flavours [Glitch] Defer scrollIntoView after DOM is drawn 8 years ago
fonts
images Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
packs Fix admin.js starting rails-ujs twice (fixes #8168) (#8213) 8 years ago
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 8 years ago