Bjoern Schiessle b918c06be6 Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/util.php		2013-09-02 14:41:46 +02:00
..
vcategories	l10n support enhanced in core	2013-02-07 16:49:36 +01:00
appconfig.php	Make the core ajax calls use the router	2012-10-02 21:58:42 +02:00
preview.php	style fixes for preview lib	2013-08-19 12:16:55 +02:00
share.php	Merge branch 'master' into sharing_mail_notification_master	2013-09-02 14:41:46 +02:00
translations.php	return plural form in ajax translations	2013-08-03 23:27:18 +02:00
update.php	adding translations to update events	2013-08-27 00:26:44 +02:00