Thomas Tanghus 5a99310cdf Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails ... Fixed some conflicts. Conflicts: apps/contacts/css/styles.css apps/contacts/templates/index.php		2011-12-28 10:14:59 +01:00
..
interface.js	Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails	2011-12-28 10:14:59 +01:00
jquery.inview.js	Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js	2011-12-17 20:38:52 +01:00