Bjoern Schiessle 8b08b1b455 Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/private/util.php		2013-10-02 10:11:18 +02:00
..
filetemplates	adding file templates for ods, odt and odp	2013-08-18 21:11:11 +02:00
403.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
404.php	Allow apps to have own 404 content, closes #3225	2013-07-29 16:54:19 +03:00
altmail.php	grammar fixes	2013-09-30 13:33:49 +02:00
edit_categories_dialog.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
error.php	tixing width and position of wider error messages	2013-08-16 00:56:09 +02:00
filepicker.html	Don't set image path in template.	2013-05-20 09:44:31 +02:00
installation.php	change font on login/install page from black to white	2013-08-17 10:26:30 +02:00
layout.base.php	initialize OC_Defaults in template constructorX	2013-07-24 11:51:21 +02:00
layout.guest.php	merge master	2013-07-24 16:31:01 +02:00
layout.user.php	Bring another enable_avatars to $_ and fix $thus->$this	2013-09-11 07:11:33 +02:00
login.php	introduce OC_Util::rememberLoginAllowed()	2013-09-24 18:01:34 +02:00
mail.php	grammar fixes	2013-09-30 13:33:49 +02:00
message.html	Port OC.dialogs to use octemplate except for prompt() and form().	2013-05-16 13:41:04 +02:00
update.php	[core] From echo to p	2013-02-27 22:55:39 +01:00