Merge branch 'main' of gitlab.com:mstarongitlab/linstrom
also delete server-old with all its problems
This commit is contained in:
commit
d99efca667
47 changed files with 2200 additions and 694 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -3,6 +3,7 @@ db.sqlite
|
|||
.env
|
||||
.lapce/
|
||||
*/tmp.*
|
||||
<<<<<<< HEAD
|
||||
/frontend/
|
||||
|
||||
|
||||
|
@ -32,3 +33,8 @@ db.sqlite
|
|||
|
||||
# broccoli-debug
|
||||
/frontend-src/DEBUG/
|
||||
=======
|
||||
|
||||
config.toml
|
||||
.air.toml
|
||||
>>>>>>> 0ec0ad42bca3a05b05256862904285bb74e314cb
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue