Merge pull request #415 from phadej/fromjson1-th-generics-backup-no-orphans

Fromjson1 th generics backup no orphans

Author: bergmark

Data/Aeson.hs

@@ -77,9 +77,14 @@ module Data.Aeson
     , GFromJSON(..)
     , GToJSON(..)
     , GToEncoding(..)
+    , Zero
+    , One
     , genericToJSON
+    , genericLiftToJSON
     , genericToEncoding
+    , genericLiftToEncoding
     , genericParseJSON
+    , genericLiftParseJSON
     , defaultOptions
 
     -- * Inspecting @'Value's@