aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/photos_upload.tpl
diff options
context:
space:
mode:
authorPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
committerPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
commit45a854762b451dafb882bc56efce054b64420627 (patch)
tree958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/tpl/photos_upload.tpl
parent1806da0851dd5cf5978b19d12783ae3101a11257 (diff)
parenta29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff)
downloadvolse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/tpl/photos_upload.tpl')
-rwxr-xr-xview/tpl/photos_upload.tpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 11a08204d..5bcef5dc1 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -26,7 +26,7 @@
<div id="body-textarea">
{{include file="field_textarea.tpl" field=$body}}
</div>
- <div class="pull-right btn-group form-group">
+ <div class="pull-right btn-group">
<div class="btn-group">
{{if $lockstate}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">