]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into master-sqlserver
authorThomas Mueller <thomas.mueller@tmit.eu>
Fri, 22 Feb 2013 21:59:09 +0000 (22:59 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Fri, 22 Feb 2013 21:59:09 +0000 (22:59 +0100)
commit9898ba4daf1acdead2ed5fa6024e779caafb353e
tree3fc02fea4997344c73e0bc5ac7bdfc5616d7a7df
parent5062ae250b767867609f64c29ab4cde65f022b75
parent78fce834058a38a7dbcc5310e16095c743434bc6
Merge branch 'master' into master-sqlserver

Conflicts:
core/templates/installation.php
core/templates/installation.php
lib/setup.php