From: Rubén Beltran del Río <redacted>
Date: Sun, 27 Sep 2020 16:08:37 +0000 (+0000)
Subject: Merge branch 'main' into 'server'
X-Git-Url: https://git.r.bdr.sh/rbdr/junction/commitdiff_plain/ac259c8645783dcb92fc0eafff166769f5216aa9?hp=-c

Merge branch 'main' into 'server'

# Conflicts:
#   .gitignore
---

ac259c8645783dcb92fc0eafff166769f5216aa9
diff --combined .gitignore
index 2d2b47d,0ac92e1..9765d1c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,3 @@@
  .idea
- node_modules
 -.DS_Store
+ node_modules
++.DS_Store