David Yip 3ab6a8b8be Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	spec/views/about/show.html.haml_spec.rb

2018-04-04 13:56:58 -05:00

..

_contact.html.haml_spec.rb

Redesign /terms page (#4338)

2017-07-24 17:15:15 +02:00

show.html.haml_spec.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-04 13:56:58 -05:00