Thomas Tanghus 1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db ... Conflicts: lib/vcategories.php		2012-11-05 12:06:59 +01:00
..
ajax	Merge branch 'master' of github.com:owncloud/core into vcategories_db	2012-11-05 12:06:59 +01:00
css	use css to show/hide fileactions	2012-10-28 12:47:42 +01:00
img	fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally	2012-10-08 15:49:48 +02:00
js	Merge branch 'master' of github.com:owncloud/core into vcategories_db	2012-11-05 12:06:59 +01:00
l10n	[tx-robot] updated from transifex	2012-11-04 00:01:42 +01:00
lostpassword	Fix introduced style errors	2012-10-27 17:45:15 +02:00
templates	Merge pull request #238 from fmms/checkstyle04	2012-11-04 08:59:45 -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
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00