]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into from-insane-autoescape-to-p
authorThomas Mueller <thomas.mueller@tmit.eu>
Fri, 1 Mar 2013 22:09:20 +0000 (23:09 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Fri, 1 Mar 2013 22:09:20 +0000 (23:09 +0100)
commit4b9863fa7d5450c51ccd6573d8bceb4161cc644c
tree8d40f7ceaf7125dc6314731432597cbc3892f7ea
parent301d065686b7cb4b49d7662e2edec9ed5fe4115b
parent31754a653b13fdf31273177f12c39e32cb8c4001
Merge branch 'master' into from-insane-autoescape-to-p

Conflicts:
apps/files/templates/index.php
apps/files/templates/index.php