Henry 99ba9edb95 Merged ...

Resolved merge conflicts

Resolved merge conflicts

2016-04-11 12:55:53 -07:00

..

sass

[Table] #798 Simplified markup, moved styles to external stylesheet

2016-04-11 12:23:36 -07:00

templates

Merged

2016-04-11 12:55:53 -07:00