]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into channels
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 18:21:51 +0000 (20:21 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 18:21:51 +0000 (20:21 +0200)
commitbed27b603de1b5eb736d123fd58b774c7f79a4fd
treee73b8fd5f69821561f5b0be5727e38d5700b7966
parent2cf26ee0b16bebe83a08e4be89681f73208ba9ae
parentb58a464b864e70076aa0bde6d70c727b2aa32397
Merge branch 'master' into channels

Conflicts:
lib/util.php
lib/ocsclient.php
lib/util.php