Tom Needham cbb2db8622 Fix merge conflicts		2012-01-01 01:18:02 +07:00
..
ajax	Use OC_JSON for json responses	2011-09-25 22:19:28 +07:00
css	Removed old jquery-ui css and js	2011-12-30 23:08:44 +07:00
img	Merge branch 'master' into newbutton	2011-11-04 03:00:03 +07:00
js	Removed old jquery-ui css and js	2011-12-30 23:08:44 +07:00
l10n	updated translations	2011-09-23 19:08:02 +07:00
lostpassword	Use correct appid for lostpassword email preference	2011-12-18 23:10:43 +07:00
templates	Initialise hasOtherDB var when not true in installation	2011-10-14 18:04:50 +07:00
strings.php	updated translations	2011-08-23 11:20:37 +07:00