Merge branch 'develop' into feature/json-patch

This commit is contained in:
Niels 2016-04-26 20:43:02 +02:00
commit 86debab3b1

View file

@ -410,7 +410,7 @@ I deeply appreciate the help of the following people.
- [Lv Zheng](https://github.com/lv-zheng) fixed a namespace issue with `int64_t` and `uint64_t`.
- [abc100m](https://github.com/abc100m) analyzed the issues with GCC 4.8 and proposed a [partial solution](https://github.com/nlohmann/json/pull/212).
- [zewt](https://github.com/zewt) added useful notes to the README file about Android.
- [Róbert Márki](https://github.com/robertmrk) added a fix to use move iterators.
- [Róbert Márki](https://github.com/robertmrk) added a fix to use move iterators and improved the integration via CMake .
Thanks a lot for helping out!