Merge branch 'develop' for release v2.0v2.0

1 files changed, 3 insertions, 3 deletions

diff --git a/compiler/src/Config.hs b/compiler/src/Config.hs
index 0ae0fa1..afcfb36 100644
--- a/compiler/src/Config.hs
+++ b/compiler/src/Config.hs
@@ -73,8 +73,8 @@ instance FromJSON GalleryConfig where
     <*> v .:? "includedTags" .!= ["*"]
     <*> v .:? "excludedTags" .!= []
     <*> v .:? "tagCategories" .!= []
-    <*> v .:? "tagsFromDirectories" .!= (TagsFromDirectoriesConfig 0 "")
-    <*> v .:? "thumbnailMaxResolution" .!= (Resolution 400 300)
+    <*> v .:? "tagsFromDirectories" .!= TagsFromDirectoriesConfig 0 ""
+    <*> v .:? "thumbnailMaxResolution" .!= Resolution 400 300
     <*> v .:? "pictureMaxResolution"
 
 readConfig :: FileName -> IO GalleryConfig
@@ -84,7 +84,7 @@ readConfig = decodeYamlFile
 data ViewerConfig = ViewerConfig
   { galleryTitle :: String
   , tagCategories :: [String]
-  } deriving (Generic, ToJSON, Show)
+  } deriving (Generic, ToJSON, FromJSON, Show)
 
 viewerConfig :: GalleryConfig -> ViewerConfig
 viewerConfig GalleryConfig{galleryTitle, tagCategories} = ViewerConfig galleryTitle tagCategories