diff options
| author | Rubén Beltran del Río <954000-rbdr@users.noreply.gitlab.com> | 2020-09-27 16:08:37 +0000 |
|---|---|---|
| committer | Rubén Beltran del Río <954000-rbdr@users.noreply.gitlab.com> | 2020-09-27 16:08:37 +0000 |
| commit | ac259c8645783dcb92fc0eafff166769f5216aa9 (patch) | |
| tree | c1680258245610509b619ffde21777120f94481a /.gitignore | |
| parent | ed9f8fd50086439ff3de12092af2f813763ada91 (diff) | |
| parent | 98342562bd88eccdb4eaeecacf866996b64ce974 (diff) | |
Merge branch 'main' into 'server'
# Conflicts:
# .gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,2 +1,3 @@ .idea -node_modules
\ No newline at end of file +node_modules +.DS_Store |