]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into move_defaults_to_template_constructor
authorBjörn Schießle <schiessle@owncloud.com>
Wed, 24 Jul 2013 09:58:11 +0000 (11:58 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Wed, 24 Jul 2013 09:58:11 +0000 (11:58 +0200)

Trivial merge