Thomas Mueller 4b80466880 Merge branch 'master' into master-sqlserver ... Conflicts: lib/db.php lib/files/cache/cache.php lib/files/cache/legacy.php lib/setup.php		2013-02-14 22:54:48 +01:00
..
ajax	Remove invalid characters from app id to prevent loading of invalid resources	2013-02-09 15:10:40 +01:00
css	Merge pull request #1697 from owncloud/navigation-details	2013-02-14 08:39:17 -08:00
doc	rename to doc	2012-12-14 14:39:05 +01:00
img	Merge pull request #1702 from owncloud/remove-images	2013-02-14 12:46:40 -08:00
js	Merge branch 'master' into master-sqlserver	2013-02-14 22:54:48 +01:00
l10n	[tx-robot] updated from transifex	2013-02-14 00:06:51 +01:00
lostpassword	Remove echo from lost password page	2013-01-04 11:12:28 -05:00
templates	Merge branch 'master' into master-sqlserver	2013-02-14 22:54:48 +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	Merge branch 'master' into master-sqlserver	2013-02-12 00:32:38 +01:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00