mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-25 06:36:45 +00:00
eee36267d6
Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change. |
||
---|---|---|
.. | ||
admin_import_validator.rb | ||
blacklisted_email_validator.rb | ||
disallowed_hashtags_validator.rb | ||
domain_validator.rb | ||
ed25519_key_validator.rb | ||
ed25519_signature_validator.rb | ||
email_mx_validator.rb | ||
existing_username_validator.rb | ||
follow_limit_validator.rb | ||
html_validator.rb | ||
import_validator.rb | ||
language_validator.rb | ||
note_length_validator.rb | ||
poll_validator.rb | ||
reaction_validator.rb | ||
registration_form_time_validator.rb | ||
status_length_validator.rb | ||
status_pin_validator.rb | ||
unique_username_validator.rb | ||
unreserved_username_validator.rb | ||
url_validator.rb | ||
vote_validator.rb |