summaryrefslogtreecommitdiffstats
path: root/.zfproject.xml
diff options
context:
space:
mode:
authormichael pereira2011-03-29 11:21:38 +0200
committermichael pereira2011-03-29 11:21:38 +0200
commit8a616c5e6d2a56b2aee5a10d68c27b99458a2c77 (patch)
tree879bdf350b2d03b20f9d39d7162191c5dce6edf0 /.zfproject.xml
parentzfconf (diff)
downloadpbs2-8a616c5e6d2a56b2aee5a10d68c27b99458a2c77.tar.gz
pbs2-8a616c5e6d2a56b2aee5a10d68c27b99458a2c77.tar.xz
pbs2-8a616c5e6d2a56b2aee5a10d68c27b99458a2c77.zip
merges
Diffstat (limited to '.zfproject.xml')
-rw-r--r--.zfproject.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.zfproject.xml b/.zfproject.xml
index 262f79c..c7a4807 100644
--- a/.zfproject.xml
+++ b/.zfproject.xml
@@ -316,6 +316,7 @@
</viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Preboot">
<viewScriptFile forActionName="index"/>
+ </viewControllerScriptsDirectory>
<viewControllerScriptsDirectory forControllerName="Group">
<viewScriptFile forActionName="add"/>
</viewControllerScriptsDirectory>
@@ -331,9 +332,9 @@
<viewControllerScriptsDirectory forControllerName="Group">
<viewScriptFile forActionName="showall"/>
</viewControllerScriptsDirectory>
- </viewScriptsDirectory>
<viewHelpersDirectory/>
<viewFiltersDirectory/>
+ </viewScriptsDirectory>
</viewsDirectory>
<bootstrapFile filesystemName="Bootstrap.php"/>
</moduleDirectory>