🔀 merge branch 'release/2.1.1'

🔀 merge branch 'release/2.1.0'
Merge branch 'develop'
2026-02-18 01:16:25 +00:00 · 2017-02-25 16:36:46 +01:00 · 2017-01-28 18:42:27 +01:00 · 2017-01-02 16:41:33 +01:00 · 2017-01-02 16:37:52 +01:00 · 2016-12-16 21:34:54 +01:00
2 changed files with 2 additions and 2 deletions
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3732b3327e34358a0e9d1fe9f661f08)](https://www.codacy.com/app/nlohmann/json?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nlohmann/json&amp;utm_campaign=Badge_Grade)
-[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/nv9fOg0XVVhWmFFy)
+[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/4NEU6ZZMoM9lpIex)
 [![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
 [![Github Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)
--- a/doc/examples/README.link
+++ b/doc/examples/README.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/nv9fOg0XVVhWmFFy"><b>online</b></a>
+<a target="_blank" href="http://melpon.org/wandbox/permlink/4NEU6ZZMoM9lpIex"><b>online</b></a>
Author	SHA1	Message	Date
Niels Lohmann	c0d511ea50	🔀 merge branch 'release/2.1.1'	2017-02-25 16:36:46 +01:00
Niels Lohmann	1e99a0273f	🔀 merge branch 'release/2.1.0'	2017-01-28 18:42:27 +01:00
Niels Lohmann	528bc96d7e	Merge branch 'develop'	2017-01-02 16:41:33 +01:00
Niels Lohmann	1c98ce869c	🔀 merge branch 'release/2.0.10'	2017-01-02 16:37:52 +01:00
Niels Lohmann	6df60b0448	🔀 Merge branch 'release/2.0.9'	2016-12-16 21:34:54 +01:00
Niels Lohmann	272ebdc900	🔖 Merge branch 'release/2.0.8'	2016-12-02 20:07:14 +01:00
Niels	79a9d00e15	Merge branch 'develop'	2016-11-03 18:54:59 +01:00
Niels	a4d13c92ba	Merge branch 'release/2.0.7'	2016-11-02 20:52:24 +01:00
Niels	60bba02cc6	Merge branch 'release/2.0.6'	2016-10-15 16:47:56 +02:00