Lukas Reschke 2b493e2f9d Merge remote-tracking branch 'upstream/master' into master-sync-upstream

2016-06-21 11:18:22 +02:00

..

appinfo

fix federation strings

2016-06-20 13:13:37 +02:00

css

Fixed problem about removing trusted servers accidentally

2016-06-08 09:02:05 +00:00

img

add icon for Federation app

2015-11-25 16:06:36 +01:00

js

Changed global variable to local

2016-06-17 07:35:23 +00:00

l10n

[tx-robot] updated from transifex

2016-06-13 12:21:11 +00:00

lib

fix federation strings

2016-06-20 13:13:37 +02:00

settings

Update license headers

2016-05-26 19:57:24 +02:00

templates

fix federation strings

2016-06-20 13:13:37 +02:00

tests

fix federation strings

2016-06-20 13:13:37 +02:00