diff options
author | Thomas Willingham <founder@kakste.com> | 2013-03-14 22:50:30 +0000 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2013-03-14 22:50:30 +0000 |
commit | d07971b909363dd82faee3e4b5a218cb21d376dc (patch) | |
tree | 1d4b76c4ed24bf3c8cbb81c73069eb8ab4b2644c /view/tpl/jot.tpl | |
parent | fbc5260995866c280fbc48bfb7899836f46136f4 (diff) | |
parent | ffcba3db81d85ae8bdc56f1772c7675aef56c78e (diff) | |
download | volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.gz volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.bz2 volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'view/tpl/jot.tpl')
-rw-r--r-- | view/tpl/jot.tpl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 84b6df679..a50d40eca 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,10 +1,5 @@ <div id="profile-jot-wrapper" > - <div id="profile-jot-banner-wrapper"> - <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> - </div> - <div id="profile-jot-banner-end"></div> <form id="profile-jot-form" action="$action" method="post" > <input type="hidden" name="type" value="$ptyp" /> |