diff options
| author | eris <femmediscord@gmail.com> | 2021-07-22 20:47:36 +0000 |
|---|---|---|
| committer | eris <femmediscord@gmail.com> | 2021-07-22 20:47:36 +0000 |
| commit | f35e3d0f3fc1a6bb4ebd77fba1dce0ac27f5b7d7 (patch) | |
| tree | b051403a1d8afb16d4f82dbc879c0f3187266ddd /src/i18n | |
| parent | 139a0d15620763329499265d505ae8f030e2ed69 (diff) | |
| parent | 425919a0d292b79869ebefd2a4d52ed4db45d319 (diff) | |
Fix merge conflict in CHANGELOG
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index 6511019c..b31e4880 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -719,6 +719,7 @@ "block": "Block", "blocked": "Blocked!", "deny": "Deny", + "edit_profile": "Edit profile", "favorites": "Favorites", "follow": "Follow", "follow_sent": "Request sent!", |