]> source.dussan.org Git - nextcloud-server.git/commit
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)
commit25320f19df017947f31ea156ade061274b5bd691
tree6096ab2633d0b58f594fb5e600638603d85acdc9
parent0b8273c76834783461bc186cca69e1a73f2570de
parent52501d6ba3da5596975a945ba00ea753f6c7f4e7
Merge branch 'master' into avater_with_encryption