githubFork/roundcubemail.git

githubFork / roundcubemail

Roundcubemail devel

summary
reflog
commits
tree
docs
forks
compare

Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 skins/larry/templates/error.html

@@ -4,9 +4,12 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
</head>
<body>

<roundcube:if condition="!env:framed" />
<body class="error">
<roundcube:include file="/includes/header.html" />
<roundcube:else />
<body class="error iframe">
<roundcube:endif />

<div class="uibox centerbox errorbox">
$__page_content

			@@ -4,9 +4,12 @@
			<title><roundcube:object name="pagetitle" /></title>
			<roundcube:include file="/includes/links.html" />
			</head>
			<body>

			<roundcube:if condition="!env:framed" />
			<body class="error">
			<roundcube:include file="/includes/header.html" />
			<roundcube:else />
			<body class="error iframe">
			<roundcube:endif />

			<div class="uibox centerbox errorbox">
			$__page_content