catch up to master
This commit is contained in:
parent
8a0add0a45
commit
a9a0db5aa4
@ -1272,6 +1272,10 @@ $("#tags").select2({
|
||||
<tr><td>dropdownCssClass</td><td>function/string</td><td>
|
||||
Css class that will be added to select2's dropdown container
|
||||
</td></tr>
|
||||
<tr><td>escapeMarkup</td><td>function</td><td>
|
||||
<code>String escapeMarkup(String markup)</code>
|
||||
<p>Function used to post-process markup returned from formatter functions. By default this function escapes html entities to prevent javascript injection.</p>
|
||||
</td></tr>
|
||||
</table>
|
||||
|
||||
<div class="row">
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 69567cd2cb96ae0d8832308903c9c35ff6b263a8
|
||||
Subproject commit 7baa3b9e93690b7dacad8fbb22f71b8a3940e04d
|
Loading…
x
Reference in New Issue
Block a user