Skip to content

GitLab

S
scratch-www
Commit 0d2416c8 authored by Technoboy10's avatar Technoboy10
Browse files
Options

fix merge conflicts

parent 90631b30
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
src/routes.json
View file @ 0d2416c8
...@@ -21,6 +21,20 @@ ...@@ -21,6 +21,20 @@
"view": "guidelines/guidelines", "view": "guidelines/guidelines",
"title": "Scratch Community Guidelines" "title": "Scratch Community Guidelines"
}, },
{
"name": "student-complete-registration",
"pattern": "^/classes/complete_registration",
"routeAlias": "/classes/(complete_registration|.+/register/.+)",
"view": "studentcompleteregistration/studentcompleteregistration",
"title": "Complete your Registration"
},
{
"name": "student-registration",
"pattern": "^/classes/:id/register/:token",
"routeAlias": "/classes/(complete_registration|.+/register/.+)",
"view": "studentregistration/studentregistration",
"title": "Class Registration"
},
{ {
"name": "conference-index", "name": "conference-index",
"pattern": "^/conference/?$", "pattern": "^/conference/?$",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment