Merge remote-tracking branch 'origin/dev'

DavidAlphaFox · Oct 4, 2021 · d01f7b0 · d01f7b0
2 parents 15949ab + f050528
commit d01f7b0
Show file tree

Hide file tree

Showing 39 changed files with 2,564 additions and 10,781 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,23 +1,19 @@
+.rebar3
+_*
 .eunit
 *.o
 *.beam
 *.plt
+*.swp
+*.swo
+.erlang.cookie
+ebin
+log
 erl_crash.dump
-.concrete/DEV_MODE
-
-# rebar 2.x
 .rebar
-rel/example_project
-ebin/*.beam
-deps
-
-# rebar 3
-.rebar3
-_build/
-_checkouts/
-
-# erlang.mk
-.erlang.mk
-_rel/
-ebin/
-aiutp.d
+logs
+_build
+.idea
+*.iml
+rebar3.crashdump
+*~
diff --git a/Makefile b/Makefile