Thomas Tanghus bec1bb5e78 Merge branch 'master' of github.com:owncloud/apps into vcategories_db ... Conflicts: contacts/appinfo/app.php		2012-11-13 12:02:15 +01:00
..
contacts.js	Merge branch 'master' of github.com:owncloud/apps into vcategories_db	2012-11-13 12:02:15 +01:00
expanding.js	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
jquery.combobox.js	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
jquery.Jcrop.js	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
jquery.Jcrop.min.js	Added files for new contact editor/viewer.	2012-02-08 08:47:03 +01:00
jquery.multi-autocomplete.js	Don't trigger unnecessary change events.	2012-04-22 00:44:53 +02:00
loader.js	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
settings.js	Silenced console logging.	2012-10-05 03:50:45 +02:00