diff options
author | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
---|---|---|
committer | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
commit | cafd4003522a472d2709569ea5eb5f80b817af23 (patch) | |
tree | bbd512126515afc929de06dce79ba847b9681092 /view/event_form.tpl | |
parent | 73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f (diff) | |
parent | a9ed5915cebcf51347acaad51d0c252e57bceaff (diff) | |
download | volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.gz volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.bz2 volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.zip |
Merge remote branch 'upstream/master'
Conflicts:
view/theme/vier/style.css
Diffstat (limited to 'view/event_form.tpl')
-rwxr-xr-x | view/event_form.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/event_form.tpl b/view/event_form.tpl index 6de471aca..7d5f8cf4a 100755 --- a/view/event_form.tpl +++ b/view/event_form.tpl @@ -1,7 +1,7 @@ -<h3>$e_text</h3> +<h3>$title</h3> <p> -$e_desc +$desc </p> <form action="$post" method="post" > |