]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into moviepreviewfallback
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 14 Nov 2013 19:57:29 +0000 (20:57 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 14 Nov 2013 19:57:29 +0000 (20:57 +0100)
commit617dc0e468cd285a28f337c565f9f9ae1aa2e85f
treed239833a66fb38a5f46f0b5bdb353ff478e267ca
parent99ee95d46c3e14cb902493df3201a2c1ad9d6dc5
parentecc7b01cee466d4893f8199abaee363c6bc4dac9
Merge branch 'master' into moviepreviewfallback

Conflicts:
lib/private/preview/movies.php
lib/private/preview/movies.php