Merge branch 'master' into add_rabbitmq_connection (b2a5e4c2) · Commits · Mitchell Moore / account_init_cleanup · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

account_init_cleanup
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

b2a5e4c2

Commit b2a5e4c2 authored 5 years ago by Bo-Chun Chen

Downloads
- Plain Diff

Merge branch 'master' into add_rabbitmq_connection

Conflicts:
	app/__init__.py
	run.py

parents 0aab004a f2644bd5

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

README.md 108 additions, 18 deletions

README.md
app/__init__.py 2 additions, 6 deletions

app/__init__.py
app/static/style/application.css 1 addition, 1 deletion

app/static/style/application.css
app/templates/auth/SignUp.html 5 additions, 6 deletions

app/templates/auth/SignUp.html
docs/images/floating_ips.png 0 additions, 0 deletions

docs/images/floating_ips.png
docs/images/network_topology.png 0 additions, 0 deletions

docs/images/network_topology.png
docs/images/rc-network .png 0 additions, 0 deletions

docs/images/rc-network .png
docs/images/security_rules.png 0 additions, 0 deletions

docs/images/security_rules.png
docs/images/site_example.png 0 additions, 0 deletions

docs/images/site_example.png
run.py 0 additions, 26 deletions

run.py

with 116 additions and 57 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