]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into interface
authorRobin Appelman <icewind1991@gmail.com>
Thu, 21 Jul 2011 22:28:17 +0000 (00:28 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Thu, 21 Jul 2011 22:28:17 +0000 (00:28 +0200)
1  2 
core/templates/layout.user.php

Simple merge