Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-08-04 08:54:28 +02:00
commit baf1d0b9ad

View File

@ -1,9 +1,11 @@
<div id="div_mysql_charset_collations">
<table class="data noclick">
<tr>
<th id="collationHeader">{% trans 'Collation' %}</th>
<th>{% trans 'Description' %}</th>
</tr>
<thead>
<tr>
<th id="collationHeader">{% trans 'Collation' %}</th>
<th>{% trans 'Description' %}</th>
</tr>
</thead>
{% for current_charset in mysql_charsets %}
<tr>
<th colspan="2" class="right">