]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-bugtracker-link-master
authorLukas Reschke <lukas@statuscode.ch>
Fri, 1 Mar 2013 22:41:23 +0000 (23:41 +0100)
committerLukas Reschke <lukas@statuscode.ch>
Fri, 1 Mar 2013 22:41:23 +0000 (23:41 +0100)
commitfadb11253b8c3f531d70892bb5f6061dd6bdc338
tree108d2c90ad70e7eba668c82e070c9b8c4da4d9fd
parentf9b454dab10b48df3c64c31ce706169f9bf703bf
parent8e5bbace718ad0c9fd9ccb7aa699cad8c34f5eea
Merge branch 'master' into fixing-bugtracker-link-master

Conflicts:
core/templates/exception.php
settings/templates/help.php
settings/templates/help.php