]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into share_expiration
authorMichael Gapczynski <mtgap@owncloud.com>
Wed, 12 Sep 2012 05:06:57 +0000 (01:06 -0400)
committerMichael Gapczynski <mtgap@owncloud.com>
Wed, 12 Sep 2012 05:06:57 +0000 (01:06 -0400)
commit60feaf9abfbc60d950de9c2b820ad46b3b973eb3
treef9931192ec8f3cf20840f87462592bf5a03b4af1
parentb194ac3ddeeab6ce923a313725b3ce85fe849baa
parent54d4e556fe3302d1e580cb6d4abbfcd5699263a5
Merge branch 'master' into share_expiration

Conflicts:
core/js/share.js
lib/util.php
core/ajax/share.php
core/js/share.js
db_structure.xml
lib/public/share.php
lib/util.php