Merge branch 'development' into...
Merge branch 'development' into '13-as-a-moderator-i-want-to-be-able-to-amend-and-remove-existing-locations-spaces-features' # Conflicts: # project_server.py
No related branches found
No related tags found
Showing
- project_server.py 8 additions, 0 deletionsproject_server.py
- static/CSS/loginstyle.css 29 additions, 0 deletionsstatic/CSS/loginstyle.css
- static/JS/Manage_Coworking_Spaces.js 1 addition, 1 deletionstatic/JS/Manage_Coworking_Spaces.js
- static/Manage_Coworking_Spaces.html 0 additions, 94 deletionsstatic/Manage_Coworking_Spaces.html
- static/Media/logo.png 0 additions, 0 deletionsstatic/Media/logo.png
- static/landingpage.html 2 additions, 2 deletionsstatic/landingpage.html
- static/login.html 75 additions, 0 deletionsstatic/login.html
- templates/Manage_Coworking_Spaces.html 92 additions, 0 deletionstemplates/Manage_Coworking_Spaces.html
- templates/base_template.html 27 additions, 0 deletionstemplates/base_template.html
- templates/test.html 4 additions, 0 deletionstemplates/test.html
- testloginserver.py 46 additions, 0 deletionstestloginserver.py
Loading
Please register or sign in to comment