Merge branch 'oxcert' into develop

oxcert · Apr 15, 2024 · c72292f · c72292f
2 parents cf09b40 + b8f78ab
commit c72292f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 This is OxCERT's fork of the [netbox-docker](https://github.com/netbox-community/netbox-docker/wiki) repository.
 
+[![push](https://github.com/oxcert/netbox-docker/actions/workflows/push.yml/badge.svg)](https://github.com/oxcert/netbox-docker/actions/workflows/push.yml) [![release](https://github.com/oxcert/netbox-docker/actions/workflows/release.yml/badge.svg)](https://github.com/oxcert/netbox-docker/actions/workflows/release.yml)
+
 We have a local branch [oxcert](https://github.com/oxcert/netbox-docker/tree/oxcert) which has been set as the default branch in this repository.
 The idea is to keep the [release](https://github.com/oxcert/netbox-docker/tree/release) branch in synch with upstream but keep all our changes in
 the oxcert branch, from where we build our netbox containers, etc. When there are upstream changes, we merge them in from the release branch.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.1