mirror of
https://github.com/inventree/inventree-website.git
synced 2025-09-13 14:41:33 +00:00
Merge remote-tracking branch 'origin/main' into 1.0.0-release
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
stats:
|
stats:
|
||||||
- name: Docker pulls
|
- name: Docker pulls
|
||||||
|
<<<<<<< HEAD
|
||||||
number: 2741900
|
number: 2741900
|
||||||
icon: fa-brands fa-docker
|
icon: fa-brands fa-docker
|
||||||
- name: GitHub Stars
|
- name: GitHub Stars
|
||||||
@@ -7,6 +8,15 @@ stats:
|
|||||||
icon: fa-solid fa-star
|
icon: fa-solid fa-star
|
||||||
- name: Forks
|
- name: Forks
|
||||||
number: 1017
|
number: 1017
|
||||||
|
=======
|
||||||
|
number: 2776151
|
||||||
|
icon: fa-brands fa-docker
|
||||||
|
- name: GitHub Stars
|
||||||
|
number: 5720
|
||||||
|
icon: fa-solid fa-star
|
||||||
|
- name: Forks
|
||||||
|
number: 1061
|
||||||
|
>>>>>>> origin/main
|
||||||
icon: fa-solid fa-code-branch
|
icon: fa-solid fa-code-branch
|
||||||
- name: Contributors
|
- name: Contributors
|
||||||
number: 108
|
number: 108
|
||||||
|
Reference in New Issue
Block a user