| 
								
								
									 onqtam | b4def6dcba | tabs instead of spaces... | 2019-03-27 01:13:10 +02:00 |  | 
				
					
						| 
								
								
									 onqtam | a0000c3235 | finished the last of the warnings | 2019-03-27 01:09:47 +02:00 |  | 
				
					
						| 
								
								
									 onqtam | 5d511a6e96 | fixed a bunch of warnings from the Makefile from the root of the repo | 2019-03-27 00:58:53 +02:00 |  | 
				
					
						| 
								
								
									 Viktor Kirilov | 82af0ecdc1 | Merge branch 'develop' into doctest | 2019-03-26 23:32:32 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d79c16801a | Merge branch 'feature/doozer' into develop | 2019-03-26 10:49:56 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 24d91cf36f | 📝 added Doozer to README | 2019-03-26 10:49:14 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 0991824584 | 👷 version output | 2019-03-26 10:41:05 +01:00 |  | 
				
					
						| 
								
								
									 onqtam | 0caf986505 | reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support | 2019-03-25 22:04:37 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 9d2f0391e0 | 👷 fixed timeout | 2019-03-25 12:30:45 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | af9da22b87 | 👷 adding xenial-armhf | 2019-03-25 07:15:03 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 0a67b51fce | 👷 forgot path to ctest | 2019-03-25 07:03:41 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | e27b282033 | 👷 skip certificate check | 2019-03-25 06:45:35 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | cde0b24389 | 👷 fixed required packages | 2019-03-25 06:43:14 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | f091fe31bc | 👷 increased timeout | 2019-03-25 06:39:41 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 28dfbedda7 | 👷 fixed timeout | 2019-03-24 18:14:59 +01:00 |  | 
				
					
						| 
								
								
									 onqtam | ff51a32be1 | updated doctest to version 2.3.1 released today | 2019-03-24 17:28:52 +02:00 |  | 
				
					
						| 
								
								
									 onqtam | 2b346099df | Merge branch 'develop' of https://github.com/nlohmann/json into doctest | 2019-03-24 17:21:44 +02:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | dcbc028b5b | 👷 fixed syntax | 2019-03-24 09:02:46 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 842d42b135 | 👷 unified paths | 2019-03-24 09:02:06 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 1e86976cfe | 👷 fixed paths | 2019-03-24 08:53:30 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 30211477b7 | 👷 fixed package name | 2019-03-24 08:36:01 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 5e1cae0a7d | 👷 install g++ | 2019-03-24 08:24:50 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c871c9a01c | 👷 install correct g++ | 2019-03-24 06:51:10 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 63d619e21f | 👷 need to install g++ | 2019-03-24 00:48:59 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c94b764a6e | 👷 fixed installation | 2019-03-24 00:43:01 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 65cdccfa8a | 👷 fixed syntax error | 2019-03-24 00:36:46 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | a72ac18514 | 👷 use recent cmake | 2019-03-24 00:36:05 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 4327ae0bef | 👷 need more recent cmake for CentOS | 2019-03-24 00:15:57 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | fabf953305 | 👷 fixed a typo | 2019-03-24 00:12:36 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 6e3e2ee2e4 | 👷 fixed buildenv values | 2019-03-24 00:11:20 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | bc5089e803 | 👷 add test output to avoid timeout | 2019-03-24 00:02:41 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7dd3e6384b | 👷 added Fedora and CentOS | 2019-03-23 23:42:29 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 490c6e926e | 👷 using raspbian | 2019-03-23 23:27:39 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 2fcca259b0 | 👷 added cmake | 2019-03-23 23:21:17 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 72dd6f349e | 👷 trying doozer | 2019-03-23 23:18:27 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | baaa2a4d0f | 🏁 trying to use constructors from std::allocator #1536 | 2019-03-21 14:09:29 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 1126c9ca74 | Merge branch 'release/3.6.1' into develop | 2019-03-20 21:03:43 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | efa1b9a7bb | 🔖 set version to 3.6.1 | 2019-03-20 20:50:05 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b33093d610 | 🐛 fixed regression #1530 | 2019-03-20 14:40:23 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 9d6ab9014f | 🏁 fixed a compilation error in MSVC #1531 | 2019-03-20 14:13:29 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | c790b9f8c0 | 🐛 fixed regression #1530 | 2019-03-20 12:41:08 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 483a086562 | ⚗️ added funding link | 2019-03-20 11:42:24 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | d2a08ddafd | Merge branch 'develop' of https://github.com/nlohmann/json into develop | 2019-03-20 11:06:55 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7c55510f76 | 🚨 fixed some warnings #1527 | 2019-03-20 11:06:39 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 3ac5fa31c5 | 💬 update issue templates | 2019-03-20 01:27:37 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 51e1564c9e | Merge branch 'release/3.6.0' into develop | 2019-03-20 00:38:29 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 0abf0f80c9 | 🔖 set version to 3.6.0 | 2019-03-20 00:22:12 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | b37392b7ac | 🔖 set version to 3.6.0 | 2019-03-20 00:19:07 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 002addabd8 | 🚨 fixed a warning | 2019-03-19 23:10:21 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | a6f9b4e36d | 👥 added contributors | 2019-03-19 17:18:33 +01:00 |  |