mirror of
https://github.com/ascribe/onion.git
synced 2025-01-03 10:25:08 +01:00
Merge remote-tracking branches 'remotes/origin/AD-44-in-piece-detail-support-public-not' and 'remotes/origin/master' into AD-416-account-settings-page-navbar
This commit is contained in:
commit
1eb85786fe
4
.gitignore
vendored
4
.gitignore
vendored
@ -11,8 +11,8 @@ pids
|
|||||||
logs
|
logs
|
||||||
results
|
results
|
||||||
|
|
||||||
node_modules
|
node_modules/*
|
||||||
npm-debug.log
|
!node_modules/react-s3-fineuploader
|
||||||
|
|
||||||
build
|
build
|
||||||
|
|
||||||
|
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[submodule "react-s3-fineuploader"]
|
||||||
|
path = react-s3-fineuploader
|
||||||
|
url = git@bitbucket.org:ascribe/react-s3-fineuploader.git
|
1
react-s3-fineuploader
Submodule
1
react-s3-fineuploader
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 2161e28e1bf5f69719c8b376ecb24fd3334806ba
|
Loading…
Reference in New Issue
Block a user