Skip to content

Fix #4531#4533

Merged
ykzts merged 1 commit intomasterfrom
unknown repository
Aug 6, 2017
Merged

Fix #4531#4533
ykzts merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Aug 6, 2017

wrong character, sorry about that~

wrong character, sorry about that~
@ghost ghost mentioned this pull request Aug 6, 2017
@ykzts ykzts added the l10n label Aug 6, 2017
Copy link
Copy Markdown
Member

@ykzts ykzts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ykzts ykzts merged commit 71384b2 into mastodon:master Aug 6, 2017
@ghost ghost deleted the fix-fr branch August 6, 2017 14:08
pfigel added a commit to pfigel/mastodon that referenced this pull request Aug 7, 2017
* tag 'v1.5.1': (25 commits)
  Bump to 1.5.1
  i18n: update Persian translation (mastodon#4540)
  Fix mastodon#4531 (mastodon#4533)
  fr.yml update (mastodon#4531)
  Translate 'Signed in as' into Japanese (mastodon#4530)
  l10n OC - Added  mastodon#4523 "signed in as" (mastodon#4529)
  fix columns_area.js (mastodon#4528)
  Update goldfinger to 2.0.1, see mastodon/goldfinger#5 (mastodon#4527)
  Add "signed in as" header to some pages (mastodon#4523)
  l10n update Occitan (mastodon#4522)
  Scroll columns area to right when children property is changed (mastodon#4517)
  Fix some mistakes in Polish translation (mastodon#4495)
  Ignore some locale keys that can but do not need to be translated (mastodon#4515)
  Dutch strings: typo (mastodon#4489)
  Use GNU libiconv in Nokogiri (mastodon#4494)
  i18n: Update Polish translation (mastodon#4479)
  Enable cache for babel-loader (mastodon#4505)
  Redirect to PasswordController#new when reset_password_token is invalid (mastodon#4506)
  make number of comparison in emojify() fewer (mastodon#4500)
  Don't normalize invalid domain names (mastodon#4499)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant