]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Tue, 21 May 2013 13:30:19 +0000 (15:30 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Tue, 21 May 2013 13:30:19 +0000 (15:30 +0200)
commit5cd14425f9cc4ff122bd3c324ce9f3be80844e91
tree60c626e5bcf04af9c50dc7d3e58ab6d3202453cf
parent9d324db05481620fd9a6883c1315e0b31fc21c45
parentafdad5c74da5c163b01f43046224b376a23f4e60
Merge branch 'master' into files_encryption

Conflicts:
apps/files_trashbin/l10n/nn_NO.php