Lukas Reschke 7a9d60d87e Merge remote-tracking branch 'upstream/master' into master-upstream-sync

2016-06-26 12:55:05 +02:00

..

appinfo

Update license headers

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

css

…

img

…

js

make encryption configurable for home storage

2015-10-27 14:24:20 +01:00

l10n

Merge remote-tracking branch 'upstream/master' into master-upstream-sync

2016-06-26 12:55:05 +02:00

lib

fix strings

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

settings

Update license headers

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

templates

fix strings

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

tests

Update license headers

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