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/packs
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
8 years ago
..
about.js Upgrade webpack to version v4.x (#6655) 8 years ago
application.js Upgrade webpack to version v4.x (#6655) 8 years ago
common.js Upgrade webpack to version v4.x (#6655) 8 years ago
public.js Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
share.js Upgrade webpack to version v4.x (#6655) 8 years ago