aboutsummaryrefslogtreecommitdiffstats
path: root/src/electron
diff options
context:
space:
mode:
authorLibravatar Raino <rainoboy97@gmail.com>2017-10-27 20:56:35 +0200
committerLibravatar Raino <rainoboy97@gmail.com>2017-10-27 20:56:35 +0200
commit059319506050ac652a4e790475fd9423db4f5133 (patch)
treee3aa16dcd0fe26b17c234ea43bbcfeb3bec93c05 /src/electron
parent[translation] Add norwegian translations (diff)
parentMerge pull request #152 from meetfranz/chore/travis-setup (diff)
downloadferdium-app-059319506050ac652a4e790475fd9423db4f5133.tar.gz
ferdium-app-059319506050ac652a4e790475fd9423db4f5133.tar.zst
ferdium-app-059319506050ac652a4e790475fd9423db4f5133.zip
Fix merge conflict and add missing translation
Diffstat (limited to 'src/electron')
0 files changed, 0 insertions, 0 deletions