inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 13:05:42 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2279

Browse Source
This commit is contained in:
Matthias Mair
2022-02-23 00:54:54 +01:00
committed by GitHub
parent a6641d067b 05b0a493ad
commit e4c6f6e8e4
29 changed files with 10148 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/templates/allauth_2fa/backup_tokens.html
View File

@ -28,6 +28,6 @@
</button>
</form>
<br>
<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm">{% trans "back to settings" %}</a>
<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm">{% trans "Back to settings" %}</a>
{% endblock %}

2
InvenTree/templates/allauth_2fa/setup.html
View File

@ -37,6 +37,6 @@
</form>
<div>
<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm mt-3">{% trans "back to settings" %}</a>
<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm mt-3">{% trans "Back to settings" %}</a>
</div>
{% endblock %}