Merge branch 'main' into 'server'

author Rubén Beltran del Río <redacted>

Sun, 27 Sep 2020 16:08:37 +0000 (16:08 +0000)

committer Rubén Beltran del Río <redacted>

Sun, 27 Sep 2020 16:08:37 +0000 (16:08 +0000)
author Rubén Beltran del Río <redacted>
Sun, 27 Sep 2020 16:08:37 +0000 (16:08 +0000)
committer Rubén Beltran del Río <redacted>
Sun, 27 Sep 2020 16:08:37 +0000 (16:08 +0000)
diff --combined .gitignore

index 2d2b47d1bdb912c2f325d6d7d3680cb3ad7d5c9b,0ac92e135066f40b9cf769404132837351fad1f8..9765d1ce39ab3d6c06f5819bffb164edcd7bdab4
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,3 @@@
   .idea
- node_modules
- -.DS_Store
+ node_modules
++.DS_Store
author	Rubén Beltran del Río <redacted>
	Sun, 27 Sep 2020 16:08:37 +0000 (16:08 +0000)
committer	Rubén Beltran del Río <redacted>
	Sun, 27 Sep 2020 16:08:37 +0000 (16:08 +0000)