Merge develop into 3011_hcard_vcard
This commit is contained in:
commit
39b37281a7
14 changed files with 1081 additions and 804 deletions
|
@ -51,4 +51,3 @@
|
|||
<input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
|
||||
</form>
|
||||
|
||||
|
||||
|
|
|
@ -138,6 +138,10 @@
|
|||
}
|
||||
|
||||
});
|
||||
|
||||
$(document).ready(function() {
|
||||
$('.comment-edit-bb').hide();
|
||||
});
|
||||
{{else}}
|
||||
<script language="javascript" type="text/javascript">
|
||||
{{/if}}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue