Bart Visscher 9832a0817d Merge branch 'master' into fullcalendar ... Conflicts: apps/calendar/index.php		2011-10-24 22:40:22 +02:00
..
ajax	Use OC_JSON for json responses	2011-09-25 22:19:28 +02:00
css	corrected position of in-field labels a bit	2011-10-23 11:46:34 +02:00
img	use existing correct info icons	2011-10-23 21:53:00 +02:00
js	Fix size calculation with css styling of tipsy popup	2011-10-21 22:08:55 +02:00
l10n	updated translations	2011-09-23 19:08:02 +02:00
lostpassword	Move lostpassword to core dir	2011-10-03 20:44:01 +02: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