Merge branch 'master' into develop

This commit is contained in:
Sebastian Messmer 2015-09-12 21:01:10 +02:00
commit cd25031d74

View File

@ -1,2 +1,3 @@
# parallelaccessstore
# parallelaccessstore [![Build Status](https://travis-ci.org/cryfs/parallelaccessstore.svg)](https://travis-ci.org/cryfs/parallelaccessstore?branch=master)
This repository contains some concurrency primitives for [CryFS](https://github.com/cryfs/cryfs).