]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 16c8f62 16e4e6d)
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
authorThomas Tanghus <thomas@tanghus.net>
Wed, 28 Dec 2011 09:14:59 +0000 (10:14 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Wed, 28 Dec 2011 09:14:59 +0000 (10:14 +0100)
commit5a99310cdf31f6c82871f775f2a8c5abe924e2e8
tree0aa1485c03001c5c64b107eca584e1e892e051c1tree | snapshot
parent16c8f626586f55f4020e788693cee72f7f6d6f55commit | diff
parent16e4e6dcc30959f733dad3b75dda3153ffcfa73fcommit | diff
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails

Fixed some conflicts.
Conflicts:
apps/contacts/css/styles.css
apps/contacts/templates/index.php
apps/contacts/css/styles.css diff1 | diff2 | blob | history
apps/contacts/js/interface.js diff1 | diff2 | blob | history
apps/contacts/templates/index.php diff1 | diff2 | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server