From ec09281d1c4896626f5623fb1f7c2f92ab2b7658 Mon Sep 17 00:00:00 2001 From: jovuit Date: Fri, 1 Mar 2019 14:35:15 +0100 Subject: [PATCH] Merge branch 'develop' into 'button404' # Conflicts: # front/src/components/PageNotFound.vue --- front/src/components/PageNotFound.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/components/PageNotFound.vue b/front/src/components/PageNotFound.vue index 5b91d2a47..bdee7db9f 100644 --- a/front/src/components/PageNotFound.vue +++ b/front/src/components/PageNotFound.vue @@ -11,7 +11,7 @@

Sorry, the page you asked for does not exist:

{{ path }} - + Go to home page