Morris Jobke a5c70f16d2 Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs ... fix thumbnail generation for subdirectories in the conflicts dialog		2014-02-21 15:33:13 +01:00
..
ajax	Merge pull request #7247 from owncloud/sharing_cleanup_step1	2014-02-20 11:56:20 +01:00
avatar	Base defaultavatar text on displayname	2013-09-28 16:46:53 +02:00
command	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00
css	Merge branch 'master' into mobile-header	2014-02-21 12:46:09 +01:00
doc	fix difference between packaged version and master	2013-08-17 10:33:11 +02:00
img	merge master	2014-02-20 10:51:13 +01:00
js	Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs	2014-02-21 15:33:13 +01:00
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
lostpassword	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
setup	Change MySQL to MySQL/MariaDB in the frontend	2014-02-07 17:03:43 +01:00
skeleton	add a real examplefile instead of an .gitignore which is a bit stupid here	2013-10-04 10:21:33 +02:00
tags	JS version of the OCP\ITags interface	2013-10-04 17:21:52 +02:00
templates	Merge branch 'master' into mobile-header	2014-02-21 12:46:09 +01:00
minimizer.php	Clean up \OC\Util	2013-08-15 15:57:32 +02:00
register_command.php	Add command line tool to show numbers of users and user directories	2014-01-07 23:06:37 +01:00
routes.php	avoid conflict with physical file config.js	2013-12-31 14:34:28 +01:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00