]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into movable_apps
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 20 Apr 2012 20:41:39 +0000 (22:41 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 20 Apr 2012 20:41:39 +0000 (22:41 +0200)
commit711aa229b882d3fc5e2fa8c22e6db2ec05642984
tree5098a6dacf65a3d557977ff39b52ac527a0eb777
parent12ef2f5054ebae12853f51d067993b825e4b4286
parent0f5864d864f63a7142064d142661c46644b2d0db
Merge branch 'master' into movable_apps
apps/calendar/export.php
apps/calendar/import.php
apps/files/css/files.css
lib/helper.php