inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 04:55:44 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into locate-mixin

Browse Source 
# Conflicts:
#	InvenTree/InvenTree/api.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/plugin/base/integration/mixins.py
#	InvenTree/plugin/mixins/__init__.py
This commit is contained in:
Oliver Walters
2022-05-16 00:10:38 +10:00
parent fa954b3812 a26840d77f
commit 95dbfa1958
63 changed files with 1356 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/templates/sample/sample.html Normal file
View File

@ -0,0 +1 @@
<h1>{{abc}}</h1>