Merge remote-tracking branch 'upstream/master' into invalidcolons

# Conflicts: # test/chrono-test.cc
2019-04-28 21:35:21 +02:00
parent 2e3352fd05 4c721e3a2f
commit b3cc9c0567
7 changed files with 107 additions and 48 deletions
@@ -305,4 +305,5 @@ TEST(ChronoTest, InvalidColons) {
  EXPECT_THROW(fmt::format("{0}=:{0::", std::chrono::seconds(0)),
               fmt::format_error);
 }
+
 #endif  // FMT_STATIC_THOUSANDS_SEPARATOR