Lukas Reschke 2b493e2f9d Merge remote-tracking branch 'upstream/master' into master-sync-upstream 8 anni fa
..
appinfo 9107fd6cd6 fix federation strings 8 anni fa
css e0aaa21bd8 Fixed problem about removing trusted servers accidentally 8 anni fa
img 38abdc1007 add icon for Federation app 8 anni fa
js 2fe67ecc3c Changed global variable to local 8 anni fa
l10n 3840466f9a [tx-robot] updated from transifex 8 anni fa
lib 9107fd6cd6 fix federation strings 8 anni fa
settings aba539703c Update license headers 8 anni fa
templates 9107fd6cd6 fix federation strings 8 anni fa
tests 9107fd6cd6 fix federation strings 8 anni fa