[hub] merge conflicts

2018-08-27 15:16:19 +05:30
parent fa26899cd0 f089dad7c7
commit 872768d89f
8 changed files with 118 additions and 188 deletions
--- a/erpnext/public/js/hub/PageContainer.vue
+++ b/erpnext/public/js/hub/PageContainer.vue
@@ -86,6 +86,10 @@ export default {
 				}
 			}

+			if (!route) {
+				return NotFound;
+			}
+
 			return route_map[route];
 		}
 	}