]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sharing_mail_notification_master
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 2 Oct 2013 21:33:50 +0000 (23:33 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 2 Oct 2013 21:33:50 +0000 (23:33 +0200)
commit9c23c3449b8f9c9d847a64c9a2c7127b87054c7c
tree60f2d7e76ee2fd11bf1dabec1b7243a3d8349448
parent8b08b1b455b474de3fa376dfafa3de63727364ea
parentde175a4b0f0971c9cbbf912bbc3fd8cbc190b53d
Merge branch 'master' into sharing_mail_notification_master

Conflicts:
core/css/share.css
apps/files/templates/index.php
core/css/share.css