Merge branch 'develop' of github.com:cryfs/cryfs into develop

This commit is contained in:
Sebastian Messmer 2016-02-11 23:54:04 +01:00
commit 1b0d53056c

View File

@ -48,5 +48,6 @@ script:
- ./test/parallelaccessstore/parallelaccessstore-test - ./test/parallelaccessstore/parallelaccessstore-test
- ./test/blockstore/blockstore-test - ./test/blockstore/blockstore-test
- ./test/blobstore/blobstore-test - ./test/blobstore/blobstore-test
- ./test/cryfs/cryfs-test
after_script: after_script:
- rm run_with_fuse.sh - rm run_with_fuse.sh