diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
commit | 91540e15eb2484a097587a38440b05897bb87638 (patch) | |
tree | dba412401da044ba203fcacb56018bfd7ed193eb /src/i18n/locales/sr.json | |
parent | Sort languages by name (diff) | |
parent | Add color to service icons (diff) | |
download | ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.gz ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.zst ferdium-app-91540e15eb2484a097587a38440b05897bb87638.zip |
Merge branch 'develop' into i18n
# Conflicts:
# src/i18n/languages.js
Diffstat (limited to 'src/i18n/locales/sr.json')
0 files changed, 0 insertions, 0 deletions