diff options
| author | Henry Jameson <me@hjkos.com> | 2018-09-09 18:44:03 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-09-09 18:44:03 +0300 |
| commit | 28a26ceab710a0839db6f641f714730be32636ed (patch) | |
| tree | 09270088b040a1c2675f61fcf53ab7ab50409cc7 /src/components/user_settings/user_settings.vue | |
| parent | 0656e0ef324ae8361a872908bb1b26a3d4ad4129 (diff) | |
| parent | 4bff6f12eda636c0df907070f9fac243e9abe30e (diff) | |
Merge remote-tracking branch 'upstream/develop' into translations-separation
* upstream/develop:
fix lint
Revert "Revert "Update messages.js""
i18n/messages.js: changed Folgende back to Follower
updated german translation
updated german translation
cleaning up some translations that broke the building
fix trailing comma
Update and fix messages.js (pt, eo)
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
0 files changed, 0 insertions, 0 deletions