Merge pull request #387 from ondrap/master

Bump aeson version.

servant-js/servant-js.cabal

@@ -63,7 +63,7 @@ executable counter
     buildable: False
 
   build-depends:    base             >= 4.7 && < 5
-                  , aeson            >= 0.7  && < 0.11
+                  , aeson            >= 0.7  && < 0.12
                   , filepath         >= 1
                   , lens             >= 4
                   , servant          == 0.5.*

servant-server/servant-server.cabal

@@ -45,7 +45,7 @@ library
     Servant.Utils.StaticFiles
   build-depends:
         base               >= 4.7  && < 5
-      , aeson              >= 0.7  && < 0.11
+      , aeson              >= 0.7  && < 0.12
       , attoparsec         >= 0.12 && < 0.14
       , bytestring         >= 0.10 && < 0.11
       , containers         >= 0.5  && < 0.6