Merges in master plus edit-class fixes.
authordsc <dsc@wikimedia.org>
Mon, 16 Apr 2012 23:20:18 +0000 (16:20 -0700)
committerdsc <dsc@wikimedia.org>
Mon, 16 Apr 2012 23:20:18 +0000 (16:20 -0700)
commit257580061db276fc72ea3b7a7e43f8b83e75d56a
tree00cdad74b07fb2ba05cc75e98635ab33d67f1414
parentd71ed4f9818653176ff4e00dfc3ae254f519709a
parent9d3e05a36aeb5c9c6b96a90a61dfd06ff8ce69d5
Merges in master plus edit-class fixes.
lib/chart/chart-option-view.co
lib/graph/graph-display-view.co
lib/graph/graph-edit-view.co
lib/server/controllers/graph.co
lib/server/server.co
lib/template/chart-scaffold.jade
lib/template/graph-display.jade
lib/template/graph-edit.jade
lib/util/cascade.co
www/css/graph.styl
www/modules.yaml