Merge pull request #7088 from wiryls:FileStorageJSON
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 24 Aug 2016 16:48:58 +0000 (16:48 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 24 Aug 2016 16:49:06 +0000 (16:49 +0000)
1  2 
modules/core/src/persistence.cpp

Simple merge