Commits

Bryan O'Sullivan committed 0191e86 Merge

Merge from 0.11

Comments (0)

Files changed (4)

 0aef582b3bf1e44a81892cb73c1dcccc8ae22b22 0.7.0.2
 93b496b0ee9a5ed762ae53618c1681e9c605efd8 0.7.0.3
 ea18d6545a480f824a16c68083ee78d79b9b6e2c 0.7.0.4
+3bfd2588b31f9cd70c759998422f208ec66b34ef 0.7.0.5
+743be245cdfa38548dcd1a0017f67b32375a171c 0.7.0.6

Data/Aeson/Encode.hs

File contents unchanged.

Data/Aeson/Types/Instances.hs

File contents unchanged.
     Data.Aeson.Types.Internal
 
   build-depends:
-    attoparsec >= 0.11.3.0,
+    attoparsec >= 0.11.3.4,
     base == 4.*,
     bytestring >= 0.10.4.0,
     containers,
     hashable >= 1.1.2.0,
     mtl,
     old-locale,
-    scientific >= 0.3,
+    scientific >= 0.3.1 && < 0.4,
     syb,
     template-haskell >= 2.4,
     text >= 1.1.1.0,