Merge remote-tracking branch 'upstream/develop' into feature/variable_management_merge_develop

This commit is contained in:
Rachel Fenichel
2016-08-08 16:58:51 -07:00
78 changed files with 3293 additions and 2205 deletions

View File

@@ -90,7 +90,7 @@ h1 {
#octaweb td {
width: 50%;
}
#octaweb td div {
#octaweb td >div {
height: 480px;
width: 100%;
}