Merge branch 'master' into bbmaster

This commit is contained in:
Helmut Merz 2012-04-14 12:40:51 +02:00
commit ed0148b213

View file

@ -2,7 +2,7 @@
tal:define="controller nocall:view/@@controller;
dummy view/setupSubviews"
tal:condition="view/update"><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
<html xmlns="http://www.w3.org/1999/xhtml"
i18n:domain="zope"
tal:define="resourceBase controller/resourceBase;
body view/pageBody">