Bart Visscher 0120f3fd62 Merge branch 'routing' ... Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php		2012-10-27 11:58:02 +02:00
..
ajax	dir in newfile has to start with /	2012-10-25 08:37:13 +02:00
appinfo	Merge branch 'routing'	2012-10-27 11:58:02 +02:00
css	separate buttons for new file and upload	2012-10-26 18:16:42 +02:00
js	Merge branch 'routing'	2012-10-27 11:58:02 +02:00
l10n	[tx-robot] updated from transifex	2012-10-27 00:02:05 +02:00
templates	Revert e1a4fe9890	2012-10-24 17:58:52 +02:00
admin.php	Whitespace cleanup	2012-10-14 21:04:08 +02:00
download.php	adding space between) and {	2012-09-07 15:22:01 +02:00
index.php	Merge branch 'routing'	2012-10-27 11:58:02 +02:00
settings.php	adding space between) and {	2012-09-07 15:22:01 +02:00