Bart Visscher 21a88613a1 Merge branch 'lostpassword' ... Conflicts: core/templates/login.php index.php lib/util.php		2011-09-30 23:48:20 +02:00
..
ajax	Use OC_JSON for json responses	2011-09-25 22:19:28 +02:00
css	added jquery ui icons. otherwise its for casual users impossible to close the new event dialog in the calendar	2011-09-30 20:48:26 +02:00
img	added jquery ui icons. otherwise its for casual users impossible to close the new event dialog in the calendar	2011-09-30 20:48:26 +02:00
js	Error when only oc_remember_login cookie set fixed.	2011-09-30 18:25:34 +02:00
l10n	updated translations	2011-09-23 19:08:02 +02:00
templates	Merge branch 'lostpassword'	2011-09-30 23:48:20 +02:00
strings.php	updated translations	2011-08-23 11:20:37 +02:00