Tom Needham ffd47ef4d7 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor		2012-01-13 16:55:55 +00:00
..
ajax	Use OC_JSON for json responses	2011-09-25 22:19:28 +02:00
css	Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor	2012-01-09 21:17:41 +00:00
img	Merge branch 'master' into newbutton	2011-11-04 03:00:03 +01:00
js	Fixed merge conflict in /files/ajax/move.php	2012-01-04 16:31:06 +00:00
l10n	update translations	2012-01-11 01:06:59 +01:00
lostpassword	Use correct appid for lostpassword email preference	2011-12-18 23:10:43 +01:00
templates	Initialise hasOtherDB var when not true in installation	2011-10-14 18:04:50 +02:00
strings.php	updated translations	2011-08-23 11:20:37 +02:00