1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +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:
ddejongh 2015-06-17 15:42:00 +02:00
commit 1eb85786fe
3 changed files with 6 additions and 2 deletions

4
.gitignore vendored
View File

@ -11,8 +11,8 @@ pids
logs
results
node_modules
npm-debug.log
node_modules/*
!node_modules/react-s3-fineuploader
build

3
.gitmodules vendored Normal file
View 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

@ -0,0 +1 @@
Subproject commit 2161e28e1bf5f69719c8b376ecb24fd3334806ba