Eryn Wells c389dc5581 Merge remote-tracking branch 'fork/feature/ui' into feature/ui ... Conflicts: templates/graph_base.html templates/navbar.html urls.py views.py		2012-08-18 16:12:56 -07:00
..
base.html	Add container block around whole content container	2012-08-17 22:01:13 -07:00
graph_base.html	Merge remote-tracking branch 'fork/feature/ui' into feature/ui	2012-08-18 16:12:56 -07:00
graph_followers.html	Rename follower_graph to graph_followers	2012-08-18 12:42:22 -07:00
graph_repo.html	Placeholder for repo graph	2012-08-18 12:42:23 -07:00
index.html	Move login template to index.html	2012-08-18 12:42:22 -07:00
navbar.html	Merge remote-tracking branch 'fork/feature/ui' into feature/ui	2012-08-18 16:12:56 -07:00