]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into multi_app_dir
authorBrice Maron <brice@bmaron.net>
Thu, 21 Jun 2012 17:15:35 +0000 (17:15 +0000)
committerBrice Maron <brice@bmaron.net>
Thu, 21 Jun 2012 17:15:35 +0000 (17:15 +0000)
commite5c56b2433b1987e4b6b8020e01f4da03623c4b8
treea650870f7bbc497833b8ea00051f9046e1779f5e
parentdf83df5263db57056d0bd70edfa3b28e7b5e6b6b
parent6707e4187e4c1186eff8dfe06999c4539ab80de7
Merge branch 'master' into multi_app_dir

Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
apps/bookmarks/templates/list.php
apps/user_webfinger/webfinger.php
core/templates/layout.user.php
lib/app.php
lib/base.php
lib/helper.php
lib/l10n.php
lib/minimizer/css.php
lib/template.php
remote.php