inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-08-14 15:41:10 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into build-fixes

Browse Source 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/templates/js/build.html
This commit is contained in:
Oliver Walters
2020-10-26 22:38:43 +11:00
parent b38fde85f2 720579dcd7
commit a4f6efc05d
33 changed files with 621 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/part/templates/part/notes.html
View File

@@ -37,7 +37,9 @@
<hr>
<div class='panel panel-default'>
<div class='panel-content'>
{% if part.notes %}
{{ part.notes | markdownify }}
{% endif %}
</div>
</div>