Qingping Hou 195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776 ... Conflicts: core/templates/layout.user.php		2013-02-25 17:16:03 -05:00
..
ajax	Style cleanup core dir	2013-02-21 23:47:21 +01:00
css	make number-input fields look like they should	2013-02-21 16:25:47 +01:00
doc	rename to doc	2012-12-14 14:39:05 +01:00
img	fix giant advanced caret in installation	2013-02-21 18:20:14 +01:00
js	Merge pull request #1706 from owncloud/master-sqlserver	2013-02-25 12:50:32 -08:00
l10n	[tx-robot] updated from transifex	2013-02-25 00:06:17 +01:00
lostpassword	Add message when trouble sending email ref #1799	2013-02-20 21:14:55 +01:00
templates	Merge branch 'master' of github.com:owncloud/core into issue_1776	2013-02-25 17:16:03 -05:00
minimizer.php	adding space between) and {	2012-09-07 15:22:01 +02:00
routes.php	Execute the post setup check after finishing the setup	2013-02-06 17:56:45 +01:00
setup.php	Merge branch 'master' into master-sqlserver	2013-02-12 00:32:38 +01:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00