mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-10-18 21:44:24 +00:00
93c714417f
Conflicts: - `package.json`: Upstream changed various script definitions in lines surrounding the one for `i18n:extract`, which had glitch-soc-specific changes. Updated the scripts as upstream did, while keeping our changes to `i18n:extract`. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper_spec.rb | ||
| application_helper_spec.rb | ||
| flashes_helper_spec.rb | ||
| formatting_helper_spec.rb | ||
| home_helper_spec.rb | ||
| instance_helper_spec.rb | ||
| jsonld_helper_spec.rb | ||
| languages_helper_spec.rb | ||
| media_component_helper_spec.rb | ||
| react_component_helper_spec.rb | ||
| routing_helper_spec.rb | ||
| settings_helper_spec.rb | ||
| statuses_helper_spec.rb | ||