]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitdf560b3d9d513e7b01c95745ae70a2151c2375fc
treeb23454b6b14704f0a1b8a3c27bc5adda65cef376tree | snapshot
parent3fbc8973eee869c04c507f549f6388b47ea9134dcommit | diff
parent46af991574a3bcec70cb6123f35eb85587d0e0c8commit | diff
Merge branch 'master' of git://anongit.kde.org/owncloud

Conflicts:
apps/media/js/collection.js
apps/media/js/collection.js diff1 | diff2 | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server