]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fbc897 46af991)
Merge branch 'master' of git://anongit.kde.org/owncloud
authorCôme BERNIGAUD <come.bernigaud@laposte.net>
Thu, 25 Aug 2011 07:07:02 +0000 (09:07 +0200)
committerCôme BERNIGAUD <come.bernigaud@laposte.net>
Thu, 25 Aug 2011 07:07:02 +0000 (09:07 +0200)
Conflicts:
apps/media/js/collection.js

1  2 
apps/media/js/collection.js patch | diff1 | diff2 | blob | history

diff --cc apps/media/js/collection.js
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server