diff options
author | Yulqen <246857+yulqen@users.noreply.github.com> | 2024-05-03 12:34:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-03 12:34:53 +0100 |
commit | 88dacb9f57a40c96f48c359275fe11f85aa1f051 (patch) | |
tree | 65164161463500565db27f703b707c9e389123dc | |
parent | 662cc1ff4e4b184ed9f60a13676ce6a96017ff6b (diff) | |
parent | afb5656fe016c800233e5b2a8db4f67be5bdfcfa (diff) |
Merge pull request #49 from defencedigital/pyswitch
Pyswitch
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | db.sqlite3 | bin | 393216 -> 393216 bytes |
2 files changed, 2 insertions, 0 deletions
@@ -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: Binary files differ |