merging (a3092818) · Commits · Arianne Bayliss / ProjectClient_Y1S1_tramshedTech_team15 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

ProjectClient_Y1S1_tramshedTech_team15
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

a3092818

Commit a3092818 authored 2 years ago by Arianne Bayliss

Downloads
- Plain Diff

merging

parents e1f7d613 9c7255d5

No related branches found

No related tags found

1 merge request!42Pulled from development/pushed test server code

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

project_server.py 5 additions, 0 deletions

project_server.py
static/CSS/loginstyle.css 5 additions, 1 deletion

static/CSS/loginstyle.css
static/JS/Manage_Coworking_Spaces.js 1 addition, 1 deletion

static/JS/Manage_Coworking_Spaces.js
static/login.html 13 additions, 1 deletion

static/login.html
templates/base_template.html 62 additions, 0 deletions

templates/base_template.html
templates/test.html 4 additions, 0 deletions

templates/test.html

with 90 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment