Merge branch 'features/categories' into 'master'

Features/categories

See merge request !1

1 files changed, 3 insertions, 4 deletions

diff --git a/src/client/elm/Main.elm b/src/client/elm/Main.elm
index fa1415d..9674b66 100644
--- a/src/client/elm/Main.elm
+++ b/src/client/elm/Main.elm
@@ -4,20 +4,19 @@ module Main exposing
 
 import Navigation
 import Time
-import Msg
+import Msg exposing (Msg(UpdatePage))
 
 import Model exposing (init)
-import Update exposing (update, urlUpdate)
+import Update exposing (update)
 import View exposing (view)
 import Page
 import Tooltip
 
 main =
-  Navigation.programWithFlags (Navigation.makeParser Page.fromHash)
+  Navigation.programWithFlags (UpdatePage << Page.fromLocation)
     { init = init
     , view = view
     , update = update
-    , urlUpdate = urlUpdate
     , subscriptions = (\model ->
         Sub.batch
           [ Time.every 1000 Msg.UpdateTime