]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into avater_with_encryption
authorBjoern Schiessle <schiessle@owncloud.com>
Tue, 15 Oct 2013 09:53:51 +0000 (11:53 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Tue, 15 Oct 2013 09:53:51 +0000 (11:53 +0200)

Trivial merge