Morris Jobke ea446544ef Merge pull request #4586 from owncloud/fixing-3431-master 11 lat temu
..
ajax c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou 11 lat temu
appinfo 0890a915b3 adding file templates for ods, odt and odp 11 lat temu
console 010c4e0b83 remove cli check 11 lat temu
css dce7cdaaec remove unneeded extra ID selectors 11 lat temu
js 101cfa2359 remove duplicate code 11 lat temu
l10n c9123263ab kill zh_CN.GB2312 11 lat temu
lib 8cf9336bcb storage information is path specific 11 lat temu
templates cabe92ef12 Merge branch 'master' into decrypt_files_again 11 lat temu
tests 9e8a6b704d Add _many_ newlines at the end of files 11 lat temu
admin.php 6c882d9806 Remove outdated comments 12 lat temu
download.php 74f6f85628 merge master into filesystem 12 lat temu
index.php 8cf9336bcb storage information is path specific 11 lat temu
settings.php 74f6f85628 merge master into filesystem 12 lat temu
triggerupdate.php 909d279e55 Add a CLI script for manually triggering checking a folder for updates 11 lat temu