diff options
| author | sD <stoned@derpymail.org> | 2020-07-20 10:23:15 +0200 |
|---|---|---|
| committer | sD <stoned@derpymail.org> | 2020-07-20 10:23:15 +0200 |
| commit | 0b63ae06bba6ee6bc428055f684164cc475a1e8e (patch) | |
| tree | d1596818fc525bf6e12976a3e262f22e86910cda /.gitignore | |
| parent | 35bc5820d194fdb964c40694078f7bc89b62af16 (diff) | |
| parent | e5f3a22ba242b0921c58290fed7147a9912dceac (diff) | |
Merge branch 'master' into objection_maker
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -48,10 +48,7 @@ Temporary Items # Node module directory node_modules - -# Minified files in the wrong folder (this is for testing) -*.b.js -*.b.js.map +package-lock.json # content folder webAO/base/
\ No newline at end of file |