Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on ... Conflicts: apps/files_external/js/google.js		2013-01-31 23:34:12 +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	no box-shadow for public share download button	2013-01-31 15:21:50 +01:00
doc	rename to doc	2012-12-14 14:39:05 +01:00
img	make background transparent	2013-01-30 12:56:22 +01:00
js	Merge branch 'master' into from_live_to_on	2013-01-31 23:34:12 +01:00
l10n	[tx-robot] updated from transifex	2013-01-31 17:05:21 +01:00
lostpassword	Remove echo from lost password page	2013-01-04 11:12:28 -05:00
templates	Merge pull request #1360 from owncloud/display_name	2013-01-29 14:05:54 -08:00
minimizer.php	adding space between) and {	2012-09-07 15:22:01 +02:00
routes.php	Add a route to the JS config	2013-01-20 23:46:46 +01:00
setup.php	Simplify has sqlite test	2012-12-04 19:34:24 +00:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00