Brewery/gravitymon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/mp-se/gravitymon into dev

Browse Source
This commit is contained in:
Magnus Persson
2022-01-30 17:27:29 +01:00
parent 3d939ad733 f88fb8241b
commit 01d7c8adb5
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/version.json
View File

@ -1,5 +1 @@
<<<<<<< HEAD
{ "project":"gravmon", "version":"0.7.9", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "format.min.htm", "about.min.htm" ] } { "project":"gravmon", "version":"0.7.9", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "format.min.htm", "about.min.htm" ] }
=======
{ "project":"gravmon", "version":"0.7.1", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "format.min.htm", "about.min.htm" ] }
>>>>>>> master