Merge remote-tracking branch 'fork/feature/ui' into feature/ui

Browse source

Conflicts:
	templates/graph_base.html
	templates/navbar.html
	urls.py
	views.py

...

This commit is contained in:

Eryn Wells 2012-08-18 16:12:56 -07:00

parent e34a4aa15d 99f37ede03

commit 6969af178c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available