merge from development

badsyntax · Apr 4, 2011 · 6e94e41 · 6e94e41
2 parents aff5006 + b7dca6c
commit 6e94e41
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -46,3 +46,6 @@
 [submodule "modules/imagemagick-driver"]
 	path = modules/imagemagick-driver
 	url = https://github.com/joelpittet/kohana-imagemagick-driver.git
+[submodule "modules/orm_mptt"]
+	path = modules/orm_mptt
+	url = git://github.com/kiall/kohana3-orm_mptt.git
diff --git a/application/views/messages/label_error.php b/application/views/messages/label_error.php
@@ -0,0 +1,3 @@
+<span class="label-error">
+	- <?php echo $error?>
+</span>
diff --git a/modules/orm_mptt b/modules/orm_mptt