Merge branch '2d' into develop

agilescientific · Oct 4, 2015 · 5065b9c · 5065b9c
2 parents 13020a9 + 3552892
commit 5065b9c
Show file tree

Hide file tree

Showing 7 changed files with 1,975 additions and 1,333 deletions.
diff --git a/static/css/modelr.css b/static/css/modelr.css
@@ -88,6 +88,7 @@ svg {
   box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
 }
 
+
 /*************/
 
 /* 1D Models */
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,6 +88,7 @@ svg { @@
       box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
     }
     /*************/
     /* 1D Models */
@@ Expand Down @@