kondou 92af840a51 Merge branch 'master' into css_cleanup_kondou ... Conflicts: core/css/styles.css settings/templates/personal.php		2013-07-24 20:35:00 +02:00
..
ajax	split upgrade logic from ajax file	2013-07-06 17:00:00 +02:00
css	Merge branch 'master' into css_cleanup_kondou	2013-07-24 20:35:00 +02:00
doc	rename to doc	2012-12-14 14:39:05 +01:00
img	adjust labels and input field groups	2013-07-23 18:41:00 +02:00
js	Create an array entry before filling it	2013-07-23 14:57:58 +03:00
l10n	[tx-robot] updated from transifex	2013-07-24 01:57:21 -04:00
lostpassword	fixed enghlish sentence, thanks to @MTGap	2013-06-19 12:05:45 +02:00
templates	merge master	2013-07-24 16:31:01 +02:00
minimizer.php	adding space between) and {	2012-09-07 15:22:01 +02:00
routes.php	implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout	2013-02-26 19:34:46 +01:00
setup.php	Suppress the notice from the nullbyte check	2013-04-09 21:11:44 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00