Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php ... Conflicts: config/config.sample.php		2014-02-21 09:51:51 +01:00
..
ajax	Merge pull request #7247 from owncloud/sharing_cleanup_step1	2014-02-20 11:56:20 +01:00
avatar
command	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00
css	fix IE10 viewport sizeing	2014-02-20 18:14:40 +01:00
doc
img	merge master	2014-02-20 10:51:13 +01:00
js	Merge branch 'master' into no-css-js-delivery-via-php	2014-02-21 09:51:51 +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
tags
templates	Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core	2014-02-20 14:29:23 +01: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	kill old minimizer code	2014-02-20 13:10:56 +01:00
strings.php