]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into permanent-share-icons
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Mon, 28 Jan 2013 18:39:51 +0000 (19:39 +0100)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Mon, 28 Jan 2013 18:39:51 +0000 (19:39 +0100)
commita78ae6a5cb99ede0c1404c3540dd3ed262cbb2b1
treee4aa8196b0f27960c03dd34756fb9c17cd74edac
parent31ebea0f6a9f6e26068b819d7d5989bf42a518af
parent06c1c35ac90f7920afa637ab0b628529b4135d40
Merge branch 'master' into permanent-share-icons