VicDeo d8b7e42fc1 Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes ... File conflicts dialog fixes		2013-10-07 08:19:40 -07:00
..
ajax	Fixed array syntax to work with PHP 5.3	2013-10-04 14:28:11 +02:00
avatar	Base defaultavatar text on displayname	2013-09-28 16:46:53 +02:00
command	Add copyright, remove starting blank line	2013-09-19 19:12:16 +02:00
css	more elegant style for Personal and Admin settings	2013-10-05 11:23:49 +02:00
doc	fix difference between packaged version and master	2013-08-17 10:33:11 +02:00
img	Optimize images with optipng	2013-10-06 21:20:49 +02:00
js	Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes	2013-10-07 08:19:40 -07:00
l10n	[tx-robot] updated from transifex	2013-10-06 19:16:10 -04:00
lostpassword	Merge branch 'master' into rename-lostpassword-controller	2013-09-04 20:46:32 +02:00
skeleton	add a real examplefile instead of an .gitignore which is a bit stupid here	2013-10-04 10:21:33 +02:00
templates	Merge pull request #5072 from owncloud/apache-auth-master	2013-10-07 06:29:56 -07:00
minimizer.php	Clean up \OC\Util	2013-08-15 15:57:32 +02:00
register_command.php	Use appinfo/register_command.php to add commands to the console command	2013-09-13 18:10:04 +02:00
routes.php	Merge branch 'master' into oc_avatars	2013-09-12 07:41:44 +02:00
setup.php	Fixed review issues	2013-09-29 20:16:32 -04:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00