]> source.dussan.org Git - nextcloud-server.git/commit
Fix merge conflict
authorLukas Reschke <lukas@statuscode.ch>
Wed, 23 Jan 2013 10:32:14 +0000 (11:32 +0100)
committerLukas Reschke <lukas@statuscode.ch>
Wed, 23 Jan 2013 10:32:14 +0000 (11:32 +0100)
commitfe56e4df7d6e2e9f37c378acbf0327c0ed694eb2
tree7402d7704bba1d34853f7ad9947f9804a58d1b87
parentc8bbbb48d3214d3ce141110aebcd59577d9e5c40
Fix merge conflict
core/templates/layout.base.php