summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYulqen <246857+yulqen@users.noreply.github.com>2024-05-03 12:34:53 +0100
committerGitHub <noreply@github.com>2024-05-03 12:34:53 +0100
commit88dacb9f57a40c96f48c359275fe11f85aa1f051 (patch)
tree65164161463500565db27f703b707c9e389123dc
parent662cc1ff4e4b184ed9f60a13676ce6a96017ff6b (diff)
parentafb5656fe016c800233e5b2a8db4f67be5bdfcfa (diff)
Merge pull request #49 from defencedigital/pyswitch
Pyswitch
-rw-r--r--Makefile2
-rw-r--r--db.sqlite3bin393216 -> 393216 bytes
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 7468e39..556e2ba 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ runserver-docker:
docker run -it --name ded -d --rm -p 8000:8000 ded:latest
runserver-docker-with-vol:
docker run -it --name ded -d --rm -p 8000:8000 -v $(PWD):/app ded:latest
+sync:
+ git pull && git checkout main && git pull && git merge pyswitch && git checkout pyswitch && git rebase main && git push
build:
docker build -t ded:latest .
test:
diff --git a/db.sqlite3 b/db.sqlite3
index 195c210..27a9666 100644
--- a/db.sqlite3
+++ b/db.sqlite3
Binary files differ