form, templating, database connection and some CSS updates
Closed
requested to merge 14-as-a-user-i-want-to-view-a-list-of-all-locations-available into development
Compare changes
Files
8
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 45
− 18
@@ -5,34 +5,63 @@ color: black;
@@ -51,17 +80,14 @@ font-size: 16px;
@@ -98,7 +124,7 @@ margin: 10px 10px;
@@ -124,13 +150,13 @@ margin: 10px 10px;
@@ -153,7 +179,8 @@ margin: 10px 10px;