Skip to content
Snippets Groups Projects
Commit e57b11f2 authored by Alice Heaton's avatar Alice Heaton :speech_balloon:
Browse files

Merge branch 'staging' into chart_widget 

Conflicts:
	django/website/dashboard/templates/dashboard/basic-text-widget.html
	django/website/local_settings.py.dev
parents ab0d0c48 cb955809
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 612 additions and 349 deletions
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

Webarchitects | Forum | Status | SSH Fingerprints