diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2022-01-17 14:47:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-17 14:47:57 +0100 |
| commit | 789974528c86f047a61a4927f5f1810c280117d4 (patch) | |
| tree | 96b5ffbea8e868a58c2d16d5829a3ed747d5eae1 | |
| parent | 66b729326d4970924ef4b553f9e866bcadc01aa2 (diff) | |
| parent | 39962565620895c81103feaacee951e27e20dbe0 (diff) | |
| download | nextcloud-server-789974528c86f047a61a4927f5f1810c280117d4.tar.gz nextcloud-server-789974528c86f047a61a4927f5f1810c280117d4.zip | |
Merge pull request #30714 from nextcloud/dept/package_lock_gitattributes
| -rw-r--r-- | .gitattributes | 3 | ||||
| -rw-r--r-- | .gitignore | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 604acb9c4ca..892870a7b58 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ /dist/* binary -/package-lock.json
\ No newline at end of file +/package-lock.json binary +/build/package-lock.json binary
\ No newline at end of file diff --git a/.gitignore b/.gitignore index 17b5716e883..2274c17f8df 100644 --- a/.gitignore +++ b/.gitignore @@ -129,7 +129,6 @@ nbproject /build/jsdocs/ /npm-debug.log /PhantomJS_* -/build/package-lock.json # puphpet puphpet |