Thomas Mueller 364b1cd391 Merge branch 'master' into fixing-998-master ... Conflicts: apps/files/js/files.js		2013-01-11 10:00:12 +01:00
..
ajax	Tweak failure message and throw exceptions from updateDbFromStructure()	2013-01-05 12:13:36 -05:00
css	Merge pull request #938 from owncloud/fix_minor_files_annoyances	2013-01-08 15:02:06 -08:00
doc	rename to doc	2012-12-14 14:39:05 +01:00
img	fix logout icon, hopefully also #969	2012-12-20 13:49:43 +01:00
js	Merge branch 'master' into fixing-998-master	2013-01-11 10:00:12 +01:00
l10n	[tx-robot] updated from transifex	2013-01-11 00:06:14 +01:00
lostpassword	Remove echo from lost password page	2013-01-04 11:12:28 -05:00
templates	Merge pull request #632 from owncloud/fix_629	2013-01-06 14:03:02 -08:00
minimizer.php	adding space between) and {	2012-09-07 15:22:01 +02:00
routes.php	Merge branch 'master' of github.com:owncloud/core into vcategories_db	2012-11-05 12:06:59 +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