Skip to content

Commit

Permalink
Merge branch 'dev' into newfeature
Browse files Browse the repository at this point in the history
  • Loading branch information
theChosenDevop authored Mar 2, 2025
2 parents f0d3b87 + a0322c4 commit bd0f897
Show file tree
Hide file tree
Showing 49 changed files with 22,212 additions and 112 deletions.
19 changes: 6 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,8 @@ Temporary Items
.apdisk

# Local
dist
/.env
dist/
.env
/.env.*
*._local.ts

Expand All @@ -410,6 +410,7 @@ dist
*.dev
*.prod


# User specific ignores
todo.txt
/.vscode/
Expand All @@ -418,19 +419,10 @@ todo.txt
# Docker compose
docker-compose.yml
data/
data/
docker-compose.yml
package-lock.json
.dev.env


package-lock.json
# Docker compose
docker-compose.yml
data/
.dev.env

/compose/compose.yaml
compose/compose.yaml

data/
docker-compose.yml
Expand All @@ -442,4 +434,5 @@ package-lock.json
package-lock.json
docker-compose.yml
data/
.dev.env
.dev.env

Loading

0 comments on commit bd0f897

Please sign in to comment.