Thomas Mueller 5788d36c8d Merge branch 'master' into fixing-1354-master ... Conflicts: settings/admin.php settings/templates/admin.php		2013-02-07 10:44:28 +01:00
..
ajax	search display name instead of uid; fix key/value order for array access	2013-01-28 15:58:40 +01:00
css	Merge pull request #1459 from owncloud/infield-detail	2013-02-06 08:23:53 -08:00
doc	rename to doc	2012-12-14 14:39:05 +01:00
img	Password Toggle Support for Login	2013-02-03 11:56:00 +01:00
js	Merge pull request #1229 from owncloud/from_live_to_on	2013-02-03 21:55:54 -08:00
l10n	[tx-robot] updated from transifex	2013-02-07 00:11:04 +01:00
lostpassword	Remove echo from lost password page	2013-01-04 11:12:28 -05:00
templates	fix shorttag issue mentioned in #1357	2013-02-06 18:19:26 +01:00
minimizer.php	adding space between) and {	2012-09-07 15:22:01 +02:00
routes.php	Execute the post setup check after finishing the setup	2013-02-06 17:56:45 +01:00
setup.php	Execute the post setup check after finishing the setup	2013-02-06 17:56:45 +01:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00