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
..
403.php	adding space between) and {	2012-09-07 15:22:01 +02:00
404.php	adding space between) and {	2012-09-07 15:22:01 +02:00
edit_categories_dialog.php	VCategories: Closing brace must be on a line by itself.	2012-11-05 16:38:23 +01:00
error.php	removed excess code	2011-08-08 19:50:42 +02:00
exception.php	Style cleanup core dir	2013-02-21 23:47:21 +01:00
installation.php	Merge branch 'master' into master-sqlserver	2013-02-22 22:59:09 +01:00
layout.base.php	Style cleanup core dir	2013-02-21 23:47:21 +01:00
layout.guest.php	Style cleanup core dir	2013-02-21 23:47:21 +01:00
layout.user.php	Merge branch 'master' of github.com:owncloud/core into issue_1776	2013-02-25 17:16:03 -05:00
login.php	Join split translated strings	2013-02-21 23:47:56 +01:00
part.pagenavi.php	more valid HTML, alt attributes, refactored pagenavi etc.	2011-08-20 05:07:58 +02:00
update.php	Style cleanup core dir	2013-02-21 23:47:21 +01:00