Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP ... Conflicts: core/templates/update.php		2013-01-28 09:57:24 +01: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	Correct link to the bugtracker in exception.php	2013-01-11 16:42:06 +01:00
installation.php	fixing <input> tag	2013-01-07 21:23:14 +01:00
layout.base.php	Fix merge conflict	2013-01-23 11:32:14 +01:00
layout.guest.php	Merge pull request #1306 from owncloud/smart-app-banner	2013-01-26 04:00:57 -08:00
layout.user.php	Merge pull request #1059 from owncloud/fixing-998-master	2013-01-26 04:15:40 -08:00
login.php	Move timezone check to external JS	2013-01-21 21:10:44 +01:00
part.pagenavi.php	more valid HTML, alt attributes, refactored pagenavi etc.	2011-08-20 05:07:58 +02:00
update.php	Merge branch 'master' into updater-CSP	2013-01-28 09:57:24 +01:00