Sean King 9ebf166739 Fix merge conflicts

2020-10-14 08:22:42 -06:00

..

fonts

Fonts: spinster --> soapbox

2020-06-09 20:14:18 -05:00

images

Remove pro/floral CSS and background

2020-10-09 12:22:27 -06:00

soapbox

Fix merge conflicts

2020-10-14 08:22:42 -06:00

styles

Fix merge conflicts

2020-10-14 08:22:42 -06:00

application.js

Fix merge conflict?

2020-09-28 20:29:41 -06:00

index.ejs

Add <!--server-generated-meta-->

2020-07-15 10:59:44 -05:00