Merge remote-tracking branch 'inventree/master'

This commit is contained in:
Oliver Walters 2020-05-04 12:04:02 +10:00
commit bbf6f6f93d

View File

@ -5,7 +5,7 @@
<table class='table table-striped table-condensed'>
<col width='25'>
<tr>
<td colspan='2'><b>{% trans "Parts" %}</b></td>
<td colspan='3'><b>{% trans "Parts" %}</b></td>
</tr>
<tr>
<td><span class='fas fa-sitemap'></span></td>
@ -18,7 +18,7 @@
<td>{{ part_count }}</td>
</tr>
<tr>
<td colspan="2"><b>{% trans "Stock Items" %}</b></td>
<td colspan="3"><b>{% trans "Stock Items" %}</b></td>
</tr>
<tr>
<td><span class='fas fa-map-marker-alt'></span></td>