merge master

This commit is contained in:
Magnus Persson
2022-07-03 19:50:22 +02:00
parent f366b78cb3
commit 0c936cfb88
2 changed files with 6 additions and 6 deletions

View File

@ -7,11 +7,7 @@ Welcome to GravityMon's documentation!
######################################
.. note::
<<<<<<< HEAD
This documentation reflects **v1.0**. Last updated 2022-05-26
=======
This documentation reflects **v1.0**. Last updated 2022-07-02
>>>>>>> master
* Docs for: `v0.8 <https://mp-se.github.io/gravitymon/v0.8/index.html>`_
* Docs for: `v0.9 <https://mp-se.github.io/gravitymon/v0.9/index.html>`_