]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fix_4258
authorkondou <kondou@ts.unde.re>
Sat, 31 Aug 2013 21:48:23 +0000 (23:48 +0200)
committerkondou <kondou@ts.unde.re>
Sat, 31 Aug 2013 21:48:23 +0000 (23:48 +0200)
commit235638e5abd35f2f19944bbe0b5a838b83465252
tree27b531a7f9a2de054e707d4415ce7de2a2c51556
parent0869f9b655ddd0b285629256521d7eafde2f5d8a
parent92e90c8eb995c886b3e9cd77c14e3f0b25b95cd7
Merge branch 'master' into fix_4258

Conflicts:
lib/image.php
lib/image.php