You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Lukas Reschke 2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
8 vuotta sitten
..
appinfo fix federation strings 8 vuotta sitten
css Fixed problem about removing trusted servers accidentally 8 vuotta sitten
img add icon for Federation app 8 vuotta sitten
js Changed global variable to local 8 vuotta sitten
l10n [tx-robot] updated from transifex 8 vuotta sitten
lib fix federation strings 8 vuotta sitten
settings Update license headers 8 vuotta sitten
templates fix federation strings 8 vuotta sitten
tests fix federation strings 8 vuotta sitten